diff options
author | John Ericson <git@JohnEricson.me> | 2019-11-05 09:55:39 -0500 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-05 14:21:27 -0500 |
commit | cdbbaa91edc3179abee15b4597b8710aa8d0ca87 (patch) | |
tree | 38c92ea15fdd9ad474eb3320f27dc4a484a01b54 /pkgs/development/tools/build-managers | |
parent | fae8d2627db00bd07d0a80669be26648161c86c0 (diff) | |
download | nixlib-cdbbaa91edc3179abee15b4597b8710aa8d0ca87.tar nixlib-cdbbaa91edc3179abee15b4597b8710aa8d0ca87.tar.gz nixlib-cdbbaa91edc3179abee15b4597b8710aa8d0ca87.tar.bz2 nixlib-cdbbaa91edc3179abee15b4597b8710aa8d0ca87.tar.lz nixlib-cdbbaa91edc3179abee15b4597b8710aa8d0ca87.tar.xz nixlib-cdbbaa91edc3179abee15b4597b8710aa8d0ca87.tar.zst nixlib-cdbbaa91edc3179abee15b4597b8710aa8d0ca87.zip |
cmake: CMAKE_*_PATH can be undefined
Diffstat (limited to 'pkgs/development/tools/build-managers')
-rwxr-xr-x | pkgs/development/tools/build-managers/cmake/setup-hook.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 8bd54d3bc13d..d5e88d773f67 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -128,22 +128,22 @@ makeCmakeFindLibs(){ for flag in $NIX_CFLAGS_COMPILE $NIX_LDFLAGS; do if test -n "$isystem_seen" && test -d "$flag"; then isystem_seen= - export CMAKE_INCLUDE_PATH="$CMAKE_INCLUDE_PATH${CMAKE_INCLUDE_PATH:+:}${flag}" + export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH-}${CMAKE_INCLUDE_PATH:+:}${flag}" elif test -n "$iframework_seen" && test -d "$flag"; then iframework_seen= - export CMAKE_FRAMEWORK_PATH="$CMAKE_FRAMEWORK_PATH${CMAKE_FRAMEWORK_PATH:+:}${flag}" + export CMAKE_FRAMEWORK_PATH="${CMAKE_FRAMEWORK_PATH-}${CMAKE_FRAMEWORK_PATH:+:}${flag}" else isystem_seen= iframework_seen= case $flag in -I*) - export CMAKE_INCLUDE_PATH="$CMAKE_INCLUDE_PATH${CMAKE_INCLUDE_PATH:+:}${flag:2}" + export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH-}${CMAKE_INCLUDE_PATH:+:}${flag:2}" ;; -L*) - export CMAKE_LIBRARY_PATH="$CMAKE_LIBRARY_PATH${CMAKE_LIBRARY_PATH:+:}${flag:2}" + export CMAKE_LIBRARY_PATH="${CMAKE_LIBRARY_PATH-}${CMAKE_LIBRARY_PATH:+:}${flag:2}" ;; -F*) - export CMAKE_FRAMEWORK_PATH="$CMAKE_FRAMEWORK_PATH${CMAKE_FRAMEWORK_PATH:+:}${flag:2}" + export CMAKE_FRAMEWORK_PATH="${CMAKE_FRAMEWORK_PATH-}${CMAKE_FRAMEWORK_PATH:+:}${flag:2}" ;; -isystem) isystem_seen=1 |