diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-01-04 12:37:17 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-01-04 12:37:17 +0100 |
| commit | f78534ca0f8ec63d79370eb2367605579efba088 (patch) | |
| tree | 679922c098b4d9445dcf8851bb63fc898531a734 | |
| parent | f4f0d2ecb96ee731cd1091c052afa50f0353bb94 (diff) | |
| download | nixlib-f78534ca0f8ec63d79370eb2367605579efba088.tar nixlib-f78534ca0f8ec63d79370eb2367605579efba088.tar.gz nixlib-f78534ca0f8ec63d79370eb2367605579efba088.tar.bz2 nixlib-f78534ca0f8ec63d79370eb2367605579efba088.tar.lz nixlib-f78534ca0f8ec63d79370eb2367605579efba088.tar.xz nixlib-f78534ca0f8ec63d79370eb2367605579efba088.tar.zst nixlib-f78534ca0f8ec63d79370eb2367605579efba088.zip | |
gcc-4.7: fix the parallel-bconfig patch
I'm sorry I forgot to test the 4.8 patch against 4.7. Now it's ported.
| -rw-r--r-- | pkgs/development/compilers/gcc/4.7/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc/4.7/parallel-bconfig-4.7.patch | 30 |
2 files changed, 31 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix index 6c71a0d640f8..34ea93cf5f0e 100644 --- a/pkgs/development/compilers/gcc/4.7/default.nix +++ b/pkgs/development/compilers/gcc/4.7/default.nix @@ -65,7 +65,7 @@ let version = "4.7.3"; enableParallelBuilding = !profiledCompiler && !langFortran; patches = [] - ++ optional enableParallelBuilding ../4.8/parallel-bconfig.patch + ++ optional enableParallelBuilding ./parallel-bconfig-4.7.patch ++ optional stdenv.isArm [ ./arm-eabi.patch ] ++ optional (cross != null) ./libstdc++-target.patch # ++ optional noSysDirs ./no-sys-dirs.patch diff --git a/pkgs/development/compilers/gcc/4.7/parallel-bconfig-4.7.patch b/pkgs/development/compilers/gcc/4.7/parallel-bconfig-4.7.patch new file mode 100644 index 000000000000..bdf0fa4931a5 --- /dev/null +++ b/pkgs/development/compilers/gcc/4.7/parallel-bconfig-4.7.patch @@ -0,0 +1,30 @@ +diff --git a/gcc/Makefile.in b/gcc/Makefile.in +index 0f6735a..ba93e9b 100644 +--- a/gcc/Makefile.in ++++ b/gcc/Makefile.in +@@ -3904,21 +3904,21 @@ build/genflags.o : genflags.c $(RTL_BASE_H) $(OBSTACK_H) $(BCONFIG_H) \ + $(SYSTEM_H) coretypes.h $(GTM_H) errors.h $(READ_MD_H) gensupport.h + build/gengenrtl.o : gengenrtl.c $(BCONFIG_H) $(SYSTEM_H) rtl.def + gengtype-lex.o build/gengtype-lex.o : gengtype-lex.c gengtype.h $(SYSTEM_H) +-gengtype-lex.o: $(CONFIG_H) ++gengtype-lex.o: $(CONFIG_H) $(BCONFIG_H) + build/gengtype-lex.o: $(BCONFIG_H) + gengtype-parse.o build/gengtype-parse.o : gengtype-parse.c gengtype.h \ + $(SYSTEM_H) +-gengtype-parse.o: $(CONFIG_H) ++gengtype-parse.o: $(CONFIG_H) $(BCONFIG_H) + build/gengtype-parse.o: $(BCONFIG_H) + gengtype-state.o build/gengtype-state.o: gengtype-state.c $(SYSTEM_H) \ + gengtype.h errors.h double-int.h version.h $(HASHTAB_H) $(OBSTACK_H) \ + $(XREGEX_H) +-gengtype-state.o: $(CONFIG_H) ++gengtype-state.o: $(CONFIG_H) $(BCONFIG_H) + build/gengtype-state.o: $(BCONFIG_H) + gengtype.o build/gengtype.o : gengtype.c $(SYSTEM_H) gengtype.h \ + rtl.def insn-notes.def errors.h double-int.h version.h $(HASHTAB_H) \ + $(OBSTACK_H) $(XREGEX_H) +-gengtype.o: $(CONFIG_H) ++gengtype.o: $(CONFIG_H) $(BCONFIG_H) + build/gengtype.o: $(BCONFIG_H) + build/genmddeps.o: genmddeps.c $(BCONFIG_H) $(SYSTEM_H) coretypes.h \ + errors.h $(READ_MD_H) |