cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge branch 'staging' into staging-next

Browse source 
Just pull fix for gcc10 "merge conflict".  Now it evaluates and builds.
This commit is contained in:
Vladimír Čunát 2020-05-12 08:18:59 +02:00
commit 2006fd4fc5
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/compilers/gcc/10/default.nix
View file

@ -5,6 +5,7 @@
, langObjCpp ? stdenv.targetPlatform.isDarwin , langObjCpp ? stdenv.targetPlatform.isDarwin
, langGo ? false , langGo ? false
, profiledCompiler ? false , profiledCompiler ? false
, langJit ? false
, staticCompiler ? false , staticCompiler ? false
, enableShared ? true , enableShared ? true
, enableLTO ? true , enableLTO ? true
@ -85,7 +86,7 @@ stdenv.mkDerivation ({
inherit patches; inherit patches;
outputs = [ "out" "lib" "man" "info" ]; outputs = [ "out" "man" "info" ] ++ stdenv.lib.optional (!langJit) "lib";
setOutputFlags = false; setOutputFlags = false;
NIX_NO_SELF_RPATH = true; NIX_NO_SELF_RPATH = true;
@ -100,10 +101,10 @@ stdenv.mkDerivation ({
--replace 'if (stdinc)' 'if (0)' --replace 'if (stdinc)' 'if (0)'
substituteInPlace libgcc/config/t-slibgcc-darwin \ 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 \ substituteInPlace libgfortran/configure \
--replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname" --replace "-install_name \\\$rpath/\\\$soname" "-install_name ''${!outputLib}/lib/\\\$soname"
''; '';
postPatch = '' postPatch = ''
@ -202,6 +203,7 @@ stdenv.mkDerivation ({
langGo langGo
langObjC langObjC
langObjCpp langObjCpp
langJit
; ;
}; };