diff options
| author | Artturin <Artturin@artturin.com> | 2023-04-10 21:37:31 +0300 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2023-04-11 20:19:58 +0300 |
| commit | b1d4dfddaf961fe8eab1207fb840fe9a67a3b72d (patch) | |
| tree | 81c7cedf05fe093c2841652857c8d085e75a5c9d /pkgs/build-support | |
| parent | fd004f17adfb9b44b19858ade03eae561c7f724c (diff) | |
| download | nixpkgs-b1d4dfddaf961fe8eab1207fb840fe9a67a3b72d.tar nixpkgs-b1d4dfddaf961fe8eab1207fb840fe9a67a3b72d.tar.gz nixpkgs-b1d4dfddaf961fe8eab1207fb840fe9a67a3b72d.tar.bz2 nixpkgs-b1d4dfddaf961fe8eab1207fb840fe9a67a3b72d.tar.lz nixpkgs-b1d4dfddaf961fe8eab1207fb840fe9a67a3b72d.tar.xz nixpkgs-b1d4dfddaf961fe8eab1207fb840fe9a67a3b72d.tar.zst nixpkgs-b1d4dfddaf961fe8eab1207fb840fe9a67a3b72d.zip | |
Revert "julia{18,19,}: fix build by a temporary hack"
This reverts commit e2691227cdc424c643511d40fd6234acdf77372e.
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 24680754c8d..597e8105fa1 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -17,7 +17,6 @@ , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null , buildPackages ? {} , libcxx ? null -, grossHackForStagingNext ? false # Whether or not to add `-B` and `-L` to `nix-support/cc-{c,ld}flags` , useCcForLibs ? @@ -408,11 +407,7 @@ stdenv.mkDerivation { 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 == null && (if grossHackForStagingNext then isClang else true) && (useGccForLibs && gccForLibs.langCC or false)) '' + + optionalString (libcxx == null && (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 |