pyrox.dev
Fixing gcc-4.5 related to the patch for ultrasparc. The patch should not be needed anymore
svn path=/nixpkgs/trunk/; revision=21633
+3
-2
pkgs/development/compilers/gcc-4.5/default.nix
+3
-2
pkgs/development/compilers/gcc-4.5/default.nix
···
132
132
};
133
133
134
134
patches =
135
-
[ ./libstdc++-target.patch ]
135
+
[ ]
136
+
++ optional (cross != null) ./libstdc++-target.patch
136
137
++ optional noSysDirs ./no-sys-dirs.patch
137
138
# The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
138
139
# target libraries and tools.
139
140
++ optional langAda ./gnat-cflags.patch
140
141
++ optional langVhdl ./ghdl-ortho-cflags.patch
141
-
++ optional (cross != null && cross.arch == "sparc64") ./pr41818.patch;
142
+
;
142
143
143
144
inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic
144
145
libcCross crossMingw;
-26
pkgs/development/compilers/gcc-4.5/pr41818.patch
-26
pkgs/development/compilers/gcc-4.5/pr41818.patch
···
1
-
From <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41818>. This fixes compilation
2
-
of the sparc64-linux-gnu cross-compiler with shared libraries.
3
-
4
-
--- trunk/Makefile.in 2010/01/07 19:21:46 155705
5
-
+++ trunk/Makefile.in 2010/01/07 19:53:50 155706
6
-
@@ -259,7 +259,7 @@
7
-
# directories built for the target.
8
-
TARGET_CONFIGARGS = @target_configargs@ --with-target-subdir="$(TARGET_SUBDIR)"
9
-
# This is the list of variables to export in the environment when
10
-
-# configuring subdirectories for the host system.
11
-
+# configuring subdirectories for the target system.
12
-
BASE_TARGET_EXPORTS = \
13
-
$(BASE_EXPORTS) \
14
-
AR="$(AR_FOR_TARGET)"; export AR; \
15
-
@@ -281,7 +281,10 @@
16
-
STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \
17
-
WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \
18
-
WINDMC="$(WINDMC_FOR_TARGET)"; export WINDMC; \
19
-
- $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
20
-
+@if gcc-bootstrap
21
-
+ $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \
22
-
+@endif gcc-bootstrap
23
-
+ $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR);
24
-
25
-
RAW_CXX_TARGET_EXPORTS = \
26
-
$(BASE_TARGET_EXPORTS) \