BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cmake: put the DEFINED check in the same if-statement

Browse source
This commit is contained in:
百地 希留耶 2022-11-02 02:26:33 +08:00 committed by GitHub
parent 7a9d47dea6
commit 5245e7324b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
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 location
"${_CMAKE_INSTALL_DIR}" "${_CMAKE_INSTALL_DIR}"
) )
@@ -47,48 +44,50 @@ endif() @@ -47,48 +44,49 @@ endif()
# Non "standard" but common install prefixes # Non "standard" but common install prefixes
list(APPEND CMAKE_SYSTEM_PREFIX_PATH list(APPEND CMAKE_SYSTEM_PREFIX_PATH
@ -22,16 +22,15 @@ index b9381c3d7d..5e944640b5 100644
) )
# List common include file locations not under the common prefixes. # List common include file locations not under the common prefixes.
+if(DEFINED ENV{NIX_CC}) +if(DEFINED ENV{NIX_CC}
+ if(IS_DIRECTORY "$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"
+ AND EXISTS "$ENV{NIX_CC}/nix-support/orig-libc-dev") + 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" _nix_cmake_libc)
+ file(STRINGS "$ENV{NIX_CC}/nix-support/orig-libc-dev" _nix_cmake_libc_dev) + file(STRINGS "$ENV{NIX_CC}/nix-support/orig-libc-dev" _nix_cmake_libc_dev)
+ else() +else()
+ set(_nix_cmake_libc @libc_lib@) + set(_nix_cmake_libc @libc_lib@)
+ set(_nix_cmake_libc_dev @libc_dev@) + set(_nix_cmake_libc_dev @libc_dev@)
+ endif()
+endif() +endif()
+ +
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH list(APPEND CMAKE_SYSTEM_INCLUDE_PATH