diff options
author | William A. Kennington III <william@wkennington.com> | 2015-05-01 15:57:09 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-05-01 15:57:09 -0700 |
commit | 00df204c82bd6d585c3f19d1a31588fa72519184 (patch) | |
tree | 4201fed8adf0505e787b9cf335cd52a7ad657570 /pkgs/development/compilers/gcc/5.1/no-sys-dirs.patch | |
parent | 8591db4b10e50ad3b61b1708787e4de314424d5d (diff) | |
parent | cf0b6b7be866aaeac75c2ee24245a7bb6ba633b2 (diff) | |
download | nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.gz nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.bz2 nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.lz nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.xz nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.zst nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/development/compilers/gcc/5.1/no-sys-dirs.patch')
-rw-r--r-- | pkgs/development/compilers/gcc/5.1/no-sys-dirs.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/pkgs/development/compilers/gcc/5.1/no-sys-dirs.patch b/pkgs/development/compilers/gcc/5.1/no-sys-dirs.patch new file mode 100644 index 000000000000..36df51904acf --- /dev/null +++ b/pkgs/development/compilers/gcc/5.1/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. */ |