cc-wrapper: expose a single, consistent libcxx #282221
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -55,6 +55,26 @@ | |
| , includeFortifyHeaders ? null | ||
| }: | ||
|
|
||
| let libcxx_args = libcxx; in | ||
| let | ||
| stdenv = stdenvNoCC; | ||
|
|
||
| useGccForLibs = useCcForLibs | ||
| && libcxx_args == null | ||
| && !stdenv.targetPlatform.isDarwin | ||
| && !(stdenv.targetPlatform.useLLVM or false) | ||
| && !(stdenv.targetPlatform.useAndroidPrebuilt or false) | ||
| && !(stdenv.targetPlatform.isiOS or false) | ||
| && gccForLibs != null; | ||
|
|
||
| libcxx = | ||
| if libcxx_args != null | ||
| then libcxx_args | ||
| else if useGccForLibs | ||
| then lib.getLib gccForLibs | ||
| else null; | ||
|
Comment on lines
+70
to
+75
There was a problem hiding this comment.
|
||
| in | ||
|
|
||
| with lib; | ||
|
|
||
| assert nativeTools -> !propagateDoc && nativePrefix != ""; | ||
|
|
@@ -64,7 +84,6 @@ assert !(nativeLibc && noLibc); | |
| assert (noLibc || nativeLibc) == (libc == null); | ||
|
|
||
| let | ||
| inherit (stdenv) hostPlatform targetPlatform; | ||
|
|
||
| includeFortifyHeaders' = if includeFortifyHeaders != null | ||
|
|
@@ -100,17 +119,7 @@ let | |
| expand-response-params = | ||
| lib.optionalString ((buildPackages.stdenv.hasCC or false) && buildPackages.stdenv.cc != "/dev/null") (import ../expand-response-params { inherit (buildPackages) stdenv; }); | ||
|
|
||
| # Analogously to cc_solib | ||
| libcxx_solib = "${lib.getLib libcxx}/lib"; | ||
|
|
||
| # The following two functions, `isGccArchSupported` and | ||
|
|
@@ -394,7 +403,7 @@ stdenv.mkDerivation { | |
|
|
||
| strictDeps = true; | ||
| propagatedBuildInputs = [ bintools ] ++ extraTools ++ optionals cc.langD or cc.langJava or false [ zlib ]; | ||
| depsTargetTargetPropagated = optional (libcxx_args != null) libcxx_args ++ extraPackages; | ||
|
|
||
| setupHooks = [ | ||
| ../setup-hooks/role.bash | ||
|
|
@@ -437,11 +446,11 @@ stdenv.mkDerivation { | |
| ## | ||
| + optionalString (useGccForLibs && isClang) '' | ||
|
|
||
| echo "-B${libcxx}/lib/gcc/${targetPlatform.config}/${libcxx.version}" >> $out/nix-support/cc-cflags | ||
| '' | ||
| + optionalString useGccForLibs '' | ||
| echo "-L${libcxx}/lib/gcc/${targetPlatform.config}/${libcxx.version}" >> $out/nix-support/cc-ldflags | ||
| echo "-L${libcxx_solib}/lib" >> $out/nix-support/cc-ldflags | ||
|
There was a problem hiding this comment. This needs to be the following, right? |
||
| '' | ||
|
|
||
| # TODO We would like to connect this to `useGccForLibs`, but we cannot yet | ||
|
|
@@ -516,27 +525,27 @@ stdenv.mkDerivation { | |
|
|
||
| # We have a libc++ directly, we have one via "smuggled" GCC, or we have one | ||
| # bundled with the C compiler because it is GCC | ||
| + optionalString (libcxx_args != null || (useGccForLibs && gccForLibs.langCC or false) || (isGNU && cc.langCC or false)) '' | ||
| touch "$out/nix-support/libcxx-cxxflags" | ||
| touch "$out/nix-support/libcxx-ldflags" | ||
| '' | ||
| # Adding -isystem flags should be done only for clang; gcc | ||
| # already knows how to find its own libstdc++, and adding | ||
| # additional -isystem flags will confuse gfortran (see | ||
| # https://github.com/NixOS/nixpkgs/pull/209870#issuecomment-1500550903) | ||
| + optionalString (libcxx_args == null && isClang && (useGccForLibs && gccForLibs.langCC or false)) '' | ||
| for dir in ${gccForLibs}${lib.optionalString (hostPlatform != targetPlatform) "/${targetPlatform.config}"}/include/c++/*; do | ||
| echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags | ||
| done | ||
| for dir in ${gccForLibs}${lib.optionalString (hostPlatform != targetPlatform) "/${targetPlatform.config}"}/include/c++/*/${targetPlatform.config}; do | ||
| echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags | ||
| done | ||
| '' | ||
| + optionalString (libcxx_args.isLLVM or false) '' | ||
| echo "-isystem ${lib.getDev libcxx_args}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags | ||
| echo "-isystem ${lib.getDev libcxx_args.cxxabi}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags | ||
| echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags | ||
| echo "-l${libcxx_args.cxxabi.libName}" >> $out/nix-support/libcxx-ldflags | ||
| '' | ||
|
|
||
| ## | ||
|
|
@@ -566,7 +575,7 @@ stdenv.mkDerivation { | |
| '' + '' | ||
| echo "$ccLDFlags" >> $out/nix-support/cc-ldflags | ||
| echo "$ccCFlags" >> $out/nix-support/cc-cflags | ||
| '' + optionalString (targetPlatform.isDarwin && (libcxx_args != null) && (cc.isClang or false)) '' | ||
| echo " -L${libcxx_solib}" >> $out/nix-support/cc-ldflags | ||
| '' | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of the sequence of
let-expressions one could also add@argsafter the lambda's formal parameters, and then definelibcxx = if args.libcxx != null then args.libcxx else .... Can't say which one is less "wacky". I've seen (and committed) both in nixpkgs