Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cmake: check if NIX_CC exists before using it #192943

Merged
merged 3 commits into from
Nov 3, 2022
Merged

cmake: check if NIX_CC exists before using it #192943

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7bec82f
cmake: check if NIX_CC exists before using it
Sep 25, 2022
7a9d47d
cmake: check for `$ENV{NIX_CC}` with quotes
KiruyaMomochi Oct 15, 2022
5245e73
cmake: put the `DEFINED` check in the same if-statement
KiruyaMomochi Nov 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions pkgs/development/tools/build-managers/cmake/001-search-path.diff
View file
Open in desktop
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,48 @@ endif()
@@ -47,48 +44,49 @@ endif()

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

# List common include file locations not under the common prefixes.
+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)
+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()
Expand Down