JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '3a9654bfe29ebd987b7426faa25f00af1fab02c5' into HEAD

Browse Source
This commit is contained in:
John Ericson 2018-05-14 14:20:40 -04:00
commit de169a5950
7 changed files with 7 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/compilers/gcc/4.5/default.nix
View File

@ -151,12 +151,7 @@ stdenv.mkDerivation ({
; ;
postPatch = postPatch =
if (stdenv.system == "i586-pc-gnu" if targetPlatform.isHurd
|| (libcCross != null # e.g., building `gcc.crossDrv'
&& libcCross ? crossConfig
&& libcCross.crossConfig == "i586-pc-gnu")
|| (targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"
&& libcCross != null))
then then
# On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
# in glibc, so add the right `-I' flags to the default spec string. # in glibc, so add the right `-I' flags to the default spec string.

6
pkgs/development/compilers/gcc/4.8/default.nix
View File

@ -193,11 +193,7 @@ stdenv.mkDerivation ({
libc_dev = stdenv.cc.libc_dev; libc_dev = stdenv.cc.libc_dev;
postPatch = postPatch =
if (hostPlatform.isHurd if targetPlatform.isHurd
|| (libcCross != null # e.g., building `gcc.crossDrv'
&& libcCross ? crossConfig
&& libcCross.crossConfig == "i586-pc-gnu")
|| (crossGNU && libcCross != null))
then then
# On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
# in glibc, so add the right `-I' flags to the default spec string. # in glibc, so add the right `-I' flags to the default spec string.

6
pkgs/development/compilers/gcc/4.9/default.nix
View File

@ -188,11 +188,7 @@ stdenv.mkDerivation ({
libc_dev = stdenv.cc.libc_dev; libc_dev = stdenv.cc.libc_dev;
postPatch = postPatch =
if (hostPlatform.isHurd if targetPlatform.isHurd
|| (libcCross != null # e.g., building `gcc.crossDrv'
&& libcCross ? crossConfig
&& libcCross.crossConfig == "i586-pc-gnu")
|| (crossGNU && libcCross != null))
then then
# On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
# in glibc, so add the right `-I' flags to the default spec string. # in glibc, so add the right `-I' flags to the default spec string.

6
pkgs/development/compilers/gcc/5/default.nix
View File

@ -204,11 +204,7 @@ stdenv.mkDerivation ({
''; '';
postPatch = postPatch =
if (hostPlatform.isHurd if targetPlatform.isHurd
|| (libcCross != null # e.g., building `gcc.crossDrv'
&& libcCross ? crossConfig
&& libcCross.crossConfig == "i586-pc-gnu")
|| (crossGNU && libcCross != null))
then then
# On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
# in glibc, so add the right `-I' flags to the default spec string. # in glibc, so add the right `-I' flags to the default spec string.

6
pkgs/development/compilers/gcc/6/default.nix
View File

@ -204,11 +204,7 @@ stdenv.mkDerivation ({
''; '';
postPatch = postPatch =
if (hostPlatform.isHurd if targetPlatform.isHurd
|| (libcCross != null # e.g., building `gcc.crossDrv'
&& libcCross ? crossConfig
&& libcCross.crossConfig == "i586-pc-gnu")
|| (crossGNU && libcCross != null))
then then
# On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
# in glibc, so add the right `-I' flags to the default spec string. # in glibc, so add the right `-I' flags to the default spec string.

6
pkgs/development/compilers/gcc/7/default.nix
View File

@ -204,11 +204,7 @@ stdenv.mkDerivation ({
''; '';
postPatch = postPatch =
if (hostPlatform.isHurd if targetPlatform.isHurd
|| (libcCross != null # e.g., building `gcc.crossDrv'
&& libcCross ? crossConfig
&& libcCross.crossConfig == "i586-pc-gnu")
|| (crossGNU && libcCross != null))
then then
# On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
# in glibc, so add the right `-I' flags to the default spec string. # in glibc, so add the right `-I' flags to the default spec string.

6
pkgs/development/compilers/gcc/snapshot/default.nix
View File

@ -183,11 +183,7 @@ stdenv.mkDerivation ({
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
postPatch = postPatch =
if (hostPlatform.isHurd if targetPlatform.isHurd
|| (libcCross != null # e.g., building `gcc.crossDrv'
&& libcCross ? crossConfig
&& libcCross.crossConfig == "i586-pc-gnu")
|| (crossGNU && libcCross != null))
then then
# On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
# in glibc, so add the right `-I' flags to the default spec string. # in glibc, so add the right `-I' flags to the default spec string.