Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 73699a03c95e
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ef779f836b22
Choose a head ref
  • 2 commits
  • 7 files changed
  • 2 contributors

Commits on May 14, 2018

  1. gcc: Simplify this old Hurd condition 

    Steps towards getting rid of crossConfig.
    @Ericson2314
    Ericson2314 committed May 14, 2018
    Copy the full SHA
    3a9654b View commit details

  2. Merge pull request #40511 from obsidiansystems/gcc-hurd-condition 

    gcc: Simplify this old Hurd condition
    @Ericson2314
    Ericson2314 authored May 14, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ef779f8 View commit details
7 changes: 1 addition & 6 deletions pkgs/development/compilers/gcc/4.5/default.nix
View file
Original file line number Diff line number Diff line change
@@ -151,12 +151,7 @@ stdenv.mkDerivation ({
;

postPatch =
if (stdenv.system == "i586-pc-gnu"
|| (libcCross != null # e.g., building `gcc.crossDrv'
&& libcCross ? crossConfig
&& libcCross.crossConfig == "i586-pc-gnu")
|| (targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"
&& libcCross != null))
if targetPlatform.isHurd
then
# 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.
6 changes: 1 addition & 5 deletions pkgs/development/compilers/gcc/4.8/default.nix
View file
Original file line number Diff line number Diff line change
@@ -193,11 +193,7 @@ stdenv.mkDerivation ({
libc_dev = stdenv.cc.libc_dev;

postPatch =
if (hostPlatform.isHurd
|| (libcCross != null # e.g., building `gcc.crossDrv'
&& libcCross ? crossConfig
&& libcCross.crossConfig == "i586-pc-gnu")
|| (crossGNU && libcCross != null))
if targetPlatform.isHurd
then
# 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.
6 changes: 1 addition & 5 deletions pkgs/development/compilers/gcc/4.9/default.nix
View file
Original file line number Diff line number Diff line change
@@ -202,11 +202,7 @@ stdenv.mkDerivation ({
libc_dev = stdenv.cc.libc_dev;

postPatch =
if (hostPlatform.isHurd
|| (libcCross != null # e.g., building `gcc.crossDrv'
&& libcCross ? crossConfig
&& libcCross.crossConfig == "i586-pc-gnu")
|| (crossGNU && libcCross != null))
if targetPlatform.isHurd
then
# 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.
6 changes: 1 addition & 5 deletions pkgs/development/compilers/gcc/5/default.nix
View file
Original file line number Diff line number Diff line change
@@ -204,11 +204,7 @@ stdenv.mkDerivation ({
'';

postPatch =
if (hostPlatform.isHurd
|| (libcCross != null # e.g., building `gcc.crossDrv'
&& libcCross ? crossConfig
&& libcCross.crossConfig == "i586-pc-gnu")
|| (crossGNU && libcCross != null))
if targetPlatform.isHurd
then
# 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.
6 changes: 1 addition & 5 deletions pkgs/development/compilers/gcc/6/default.nix
View file
Original file line number Diff line number Diff line change
@@ -204,11 +204,7 @@ stdenv.mkDerivation ({
'';

postPatch =
if (hostPlatform.isHurd
|| (libcCross != null # e.g., building `gcc.crossDrv'
&& libcCross ? crossConfig
&& libcCross.crossConfig == "i586-pc-gnu")
|| (crossGNU && libcCross != null))
if targetPlatform.isHurd
then
# 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.
6 changes: 1 addition & 5 deletions pkgs/development/compilers/gcc/7/default.nix
View file
Original file line number Diff line number Diff line change
@@ -204,11 +204,7 @@ stdenv.mkDerivation ({
'';

postPatch =
if (hostPlatform.isHurd
|| (libcCross != null # e.g., building `gcc.crossDrv'
&& libcCross ? crossConfig
&& libcCross.crossConfig == "i586-pc-gnu")
|| (crossGNU && libcCross != null))
if targetPlatform.isHurd
then
# 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.
6 changes: 1 addition & 5 deletions pkgs/development/compilers/gcc/snapshot/default.nix
View file
Original file line number Diff line number Diff line change
@@ -183,11 +183,7 @@ stdenv.mkDerivation ({
hardeningDisable = [ "format" ];

postPatch =
if (hostPlatform.isHurd
|| (libcCross != null # e.g., building `gcc.crossDrv'
&& libcCross ? crossConfig
&& libcCross.crossConfig == "i586-pc-gnu")
|| (crossGNU && libcCross != null))
if targetPlatform.isHurd
then
# 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.