cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #187777 from trofi/cmake-fix-non-libc-case

Browse source 
cmake: fix crash on CC without libc support
This commit is contained in:
Sergei Trofimovich 2022-08-21 21:29:43 +01:00 committed by GitHub
commit d599919bc3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/tools/build-managers/cmake/001-search-path.diff
View file

@ -12,7 +12,7 @@ index b9381c3d7d..5e944640b5 100644
# CMake install location
"${_CMAKE_INSTALL_DIR}"
)
@@ -47,48 +44,46 @@ endif()
@@ -47,48 +44,48 @@ endif()
# Non "standard" but common install prefixes
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
@ -22,7 +22,9 @@ index b9381c3d7d..5e944640b5 100644
)
# List common include file locations not under the common prefixes.
+if(IS_DIRECTORY $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()