diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-18 17:18:50 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-08-18 17:20:37 +0200 |
| commit | a0c60b76ec258ea158bebaea53d6d39055cdf857 (patch) | |
| tree | 4b0b9d249cf27ce4c46cdba3a6b87a62344d9397 /pkgs/development/compilers/gcc/4.8/no-sys-dirs.patch | |
| parent | 6dc5db3850a2ef5d01e871ec36f1d31457fc64da (diff) | |
| download | nixpkgs-a0c60b76ec258ea158bebaea53d6d39055cdf857.tar nixpkgs-a0c60b76ec258ea158bebaea53d6d39055cdf857.tar.gz nixpkgs-a0c60b76ec258ea158bebaea53d6d39055cdf857.tar.bz2 nixpkgs-a0c60b76ec258ea158bebaea53d6d39055cdf857.tar.lz nixpkgs-a0c60b76ec258ea158bebaea53d6d39055cdf857.tar.xz nixpkgs-a0c60b76ec258ea158bebaea53d6d39055cdf857.tar.zst nixpkgs-a0c60b76ec258ea158bebaea53d6d39055cdf857.zip | |
gcc: Revive the no-sys-dirs patch
For now, we don't NATIVE_SYSTEM_HEADER_DIR because it breaks the build. However, it points to Glibc in the Nix store (not /usr/include) so it's kind of okay.
Diffstat (limited to 'pkgs/development/compilers/gcc/4.8/no-sys-dirs.patch')
| -rw-r--r-- | pkgs/development/compilers/gcc/4.8/no-sys-dirs.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/pkgs/development/compilers/gcc/4.8/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.8/no-sys-dirs.patch new file mode 100644 index 00000000000..36df51904ac --- /dev/null +++ b/pkgs/development/compilers/gcc/4.8/no-sys-dirs.patch @@ -0,0 +1,28 @@ +diff -ru -x '*~' gcc-4.8.3-orig/gcc/cppdefault.c gcc-4.8.3/gcc/cppdefault.c +--- gcc-4.8.3-orig/gcc/cppdefault.c 2013-01-10 21:38:27.000000000 +0100 ++++ gcc-4.8.3/gcc/cppdefault.c 2014-08-18 16:20:32.893944536 +0200 +@@ -35,6 +35,8 @@ + # undef CROSS_INCLUDE_DIR + #endif + ++#undef LOCAL_INCLUDE_DIR ++ + const struct default_include cpp_include_defaults[] + #ifdef INCLUDE_DEFAULTS + = INCLUDE_DEFAULTS; +diff -ru -x '*~' gcc-4.8.3-orig/gcc/gcc.c gcc-4.8.3/gcc/gcc.c +--- gcc-4.8.3-orig/gcc/gcc.c 2014-03-23 12:30:57.000000000 +0100 ++++ gcc-4.8.3/gcc/gcc.c 2014-08-18 13:19:32.689201690 +0200 +@@ -1162,10 +1162,10 @@ + /* Default prefixes to attach to command names. */ + + #ifndef STANDARD_STARTFILE_PREFIX_1 +-#define STANDARD_STARTFILE_PREFIX_1 "/lib/" ++#define STANDARD_STARTFILE_PREFIX_1 "" + #endif + #ifndef STANDARD_STARTFILE_PREFIX_2 +-#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" ++#define STANDARD_STARTFILE_PREFIX_2 "" + #endif + + #ifdef CROSS_DIRECTORY_STRUCTURE /* Don't use these prefixes for a cross compiler. */ |