diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-05-11 19:42:33 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-11 19:42:33 -0500 |
| commit | c89072465c75c1a9acf51d623cdbc51d1f37c168 (patch) | |
| tree | 2fbbdc859d5369adcb995ce34d4455730f2b534a | |
| parent | 9efd23e64de5ddf78c3c003b390b0833c9f0e676 (diff) | |
| parent | f7a93031a284d39e303e98006a82250e3139cee9 (diff) | |
| download | nixpkgs-c89072465c75c1a9acf51d623cdbc51d1f37c168.tar nixpkgs-c89072465c75c1a9acf51d623cdbc51d1f37c168.tar.gz nixpkgs-c89072465c75c1a9acf51d623cdbc51d1f37c168.tar.bz2 nixpkgs-c89072465c75c1a9acf51d623cdbc51d1f37c168.tar.lz nixpkgs-c89072465c75c1a9acf51d623cdbc51d1f37c168.tar.xz nixpkgs-c89072465c75c1a9acf51d623cdbc51d1f37c168.tar.zst nixpkgs-c89072465c75c1a9acf51d623cdbc51d1f37c168.zip | |
Merge pull request #87637 from cole-h/gcc10
gcc10: fix eval due to missing `langJit`
| -rw-r--r-- | pkgs/development/compilers/gcc/10/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index 5e0a25ea60b..4a4cfce5cc4 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -5,6 +5,7 @@ , langObjCpp ? stdenv.targetPlatform.isDarwin , langGo ? false , profiledCompiler ? false +, langJit ? false , staticCompiler ? false , enableShared ? true , enableLTO ? true @@ -85,7 +86,7 @@ stdenv.mkDerivation ({ inherit patches; - outputs = [ "out" "lib" "man" "info" ]; + outputs = [ "out" "man" "info" ] ++ stdenv.lib.optional (!langJit) "lib"; setOutputFlags = false; NIX_NO_SELF_RPATH = true; @@ -100,10 +101,10 @@ stdenv.mkDerivation ({ --replace 'if (stdinc)' 'if (0)' substituteInPlace libgcc/config/t-slibgcc-darwin \ - --replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name $lib/lib/\$(SHLIB_INSTALL_NAME)" + --replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name ''${!outputLib}/lib/\$(SHLIB_INSTALL_NAME)" substituteInPlace libgfortran/configure \ - --replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname" + --replace "-install_name \\\$rpath/\\\$soname" "-install_name ''${!outputLib}/lib/\\\$soname" ''; postPatch = '' @@ -202,6 +203,7 @@ stdenv.mkDerivation ({ langGo langObjC langObjCpp + langJit ; }; |