diff options
| author | Mark Friedenbach <mark@friedenbach.org> | 2022-04-20 12:50:37 -0700 |
|---|---|---|
| committer | Alfonso Roman Zubeldia <alfonsoromanz24@gmail.com> | 2024-01-11 15:36:18 -0300 |
| commit | 4756114e505cff8848fb6344ef9a48d8822066c1 (patch) | |
| tree | 53338abcfbc49712e2173be936325b4758715cbf | |
| parent | 4baa162dbb3c6464e196a4a21fe63794859021b4 (diff) | |
[depends] Allow PATH with spaces in directory names.
added test and update code based on feedback
| -rwxr-xr-x | ci/test/02_run_container.sh | 2 | ||||
| -rw-r--r-- | depends/funcs.mk | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ci/test/02_run_container.sh b/ci/test/02_run_container.sh index 64b1e4e182..8a7a978994 100755 --- a/ci/test/02_run_container.sh +++ b/ci/test/02_run_container.sh @@ -70,7 +70,7 @@ if [ "$CI_OS_NAME" == "macos" ]; then fi CI_EXEC () { - $CI_EXEC_CMD_PREFIX bash -c "export PATH=${BINS_SCRATCH_DIR}:${BASE_ROOT_DIR}/ci/retry:\$PATH && cd \"${BASE_ROOT_DIR}\" && $*" + $CI_EXEC_CMD_PREFIX bash -c "export PATH=\"/path_with space:${BINS_SCRATCH_DIR}:${BASE_ROOT_DIR}/ci/retry:\$PATH\" && cd \"${BASE_ROOT_DIR}\" && $*" } export -f CI_EXEC diff --git a/depends/funcs.mk b/depends/funcs.mk index 987be4e611..ce87aa579f 100644 --- a/depends/funcs.mk +++ b/depends/funcs.mk @@ -139,9 +139,9 @@ $(1)_config_env+=PKG_CONFIG_LIBDIR=$($($(1)_type)_prefix)/lib/pkgconfig $(1)_config_env+=PKG_CONFIG_PATH=$($($(1)_type)_prefix)/share/pkgconfig $(1)_config_env+=PKG_CONFIG_SYSROOT_DIR=/ $(1)_config_env+=CMAKE_MODULE_PATH=$($($(1)_type)_prefix)/lib/cmake -$(1)_config_env+=PATH=$(build_prefix)/bin:$(PATH) -$(1)_build_env+=PATH=$(build_prefix)/bin:$(PATH) -$(1)_stage_env+=PATH=$(build_prefix)/bin:$(PATH) +$(1)_config_env+=PATH="$(build_prefix)/bin:$(PATH)" +$(1)_build_env+=PATH="$(build_prefix)/bin:$(PATH)" +$(1)_stage_env+=PATH="$(build_prefix)/bin:$(PATH)" # Setting a --build type that differs from --host will explicitly enable # cross-compilation mode. Note that --build defaults to the output of |