Skip to content

Commit

Permalink
cmake: put the DEFINED check in the same if-statement
Browse files Browse the repository at this point in the history
  • Loading branch information
KiruyaMomochi authored Nov 1, 2022
1 parent 7a9d47d commit 5245e73
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions pkgs/development/tools/build-managers/cmake/001-search-path.diff
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ index b9381c3d7d..5e944640b5 100644
# CMake install location
"${_CMAKE_INSTALL_DIR}"
)
@@ -47,48 +44,50 @@ endif()
@@ -47,48 +44,49 @@ endif()

# Non "standard" but common install prefixes
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
Expand All @@ -22,16 +22,15 @@ index b9381c3d7d..5e944640b5 100644
)

# List common include file locations not under the common prefixes.
+if(DEFINED ENV{NIX_CC})
+ if(IS_DIRECTORY "$ENV{NIX_CC}"
+ AND EXISTS "$ENV{NIX_CC}/nix-support/orig-libc"
+ AND EXISTS "$ENV{NIX_CC}/nix-support/orig-libc-dev")
+ file(STRINGS "$ENV{NIX_CC}/nix-support/orig-libc" _nix_cmake_libc)
+ file(STRINGS "$ENV{NIX_CC}/nix-support/orig-libc-dev" _nix_cmake_libc_dev)
+ else()
+ set(_nix_cmake_libc @libc_lib@)
+ set(_nix_cmake_libc_dev @libc_dev@)
+ endif()
+if(DEFINED ENV{NIX_CC}
+ AND IS_DIRECTORY "$ENV{NIX_CC}"
+ AND EXISTS "$ENV{NIX_CC}/nix-support/orig-libc"
+ AND EXISTS "$ENV{NIX_CC}/nix-support/orig-libc-dev")
+ file(STRINGS "$ENV{NIX_CC}/nix-support/orig-libc" _nix_cmake_libc)
+ file(STRINGS "$ENV{NIX_CC}/nix-support/orig-libc-dev" _nix_cmake_libc_dev)
+else()
+ set(_nix_cmake_libc @libc_lib@)
+ set(_nix_cmake_libc_dev @libc_dev@)
+endif()
+
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
Expand Down

0 comments on commit 5245e73

Please sign in to comment.