diff options
| author | Andreas Fuchs <asf@boinkor.net> | 2020-08-27 12:38:31 -0400 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-11-27 13:28:16 +0000 |
| commit | 84875aacac4550333888ac4a5624c08157c3a673 (patch) | |
| tree | b792a76e8ab8d277a2a5be19f8701ab0bb8c588a /nixpkgs/pkgs/development/compilers | |
| parent | 1313dbc4c9068f2c47c808b537aba5f14da8ba1c (diff) | |
| download | nixlib-84875aacac4550333888ac4a5624c08157c3a673.tar nixlib-84875aacac4550333888ac4a5624c08157c3a673.tar.gz nixlib-84875aacac4550333888ac4a5624c08157c3a673.tar.bz2 nixlib-84875aacac4550333888ac4a5624c08157c3a673.tar.lz nixlib-84875aacac4550333888ac4a5624c08157c3a673.tar.xz nixlib-84875aacac4550333888ac4a5624c08157c3a673.tar.zst nixlib-84875aacac4550333888ac4a5624c08157c3a673.zip | |
gcc: Only use strip -x if building libgccjit on darwin
It's not necessary to use strip -x otherwise, so let's just use it for the JIT library. (cherry picked from commit 41e34e76d8802feaa9c13f88a5f032c529fc74e9)
Diffstat (limited to 'nixpkgs/pkgs/development/compilers')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/gcc/9/default.nix | 2 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/compilers/gcc/9/default.nix b/nixpkgs/pkgs/development/compilers/gcc/9/default.nix index 7cfc977b3f4c..305ed56df78c 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/9/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/9/default.nix @@ -184,7 +184,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit (stdenv) lib; - inherit version hostPlatform gnatboot langAda langGo; + inherit version hostPlatform gnatboot langAda langGo langJit; }; dontDisableStatic = true; diff --git a/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix b/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix index e4a7cfb4287c..1c65b4a8ba64 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix @@ -2,6 +2,7 @@ , gnatboot ? null , langAda ? false , langJava ? false +, langJit ? false , langGo }: assert langJava -> lib.versionOlder version "7"; @@ -50,10 +51,10 @@ lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' export ac_cv_func_aligned_alloc=no '' -# In order to properly install on macOS Catalina, strip(1) upon -# installation must not remove external symbols, otherwise the install -# step errors with "symbols referenced by indirect symbol table -# entries that can't be stripped". -+ lib.optionalString (hostPlatform.isDarwin) '' +# In order to properly install libgccjit on macOS Catalina, strip(1) +# upon installation must not remove external symbols, otherwise the +# install step errors with "symbols referenced by indirect symbol +# table entries that can't be stripped". ++ lib.optionalString (hostPlatform.isDarwin && langJit) '' export STRIP='strip -x' '' |