d0ae140f69
Dealt with the gcc 4.4 expression for it to work well for a native and a cross compiler, adding a pair of patches to get the job done without much side effects. One (libtool problems on -B) comes from the gcc 4.3 expression, while the other fixes a bug already fixed in gcc 4.4.3. svn path=/nixpkgs/branches/stdenv-updates/; revision=18833
49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
diff --git a/libgomp/configure b/libgomp/configure
|
|
index deef673..9e4a790 100755
|
|
--- a/libgomp/configure
|
|
+++ b/libgomp/configure
|
|
@@ -23848,6 +23848,11 @@ old_archive_cmds=$lt_old_archive_cmds
|
|
# A language specific compiler.
|
|
CC=$lt_compiler
|
|
|
|
+# Ugly hack to get libmudflap (and other libraries) to build.
|
|
+# Libtool filters out \`-B' flags when linking (why?), so the \`-B' flag
|
|
+# to Glibc gets lost. Here we forcibly add it to any invocation.
|
|
+CC="\$CC $NIX_EXTRA_CFLAGS_TARGET $NIX_EXTRA_LDFLAGS_TARGET"
|
|
+
|
|
# Is the compiler the GNU compiler?
|
|
with_gcc=$GCC
|
|
|
|
diff --git a/libmudflap/configure b/libmudflap/configure
|
|
index ae1be92..4ee1e18 100755
|
|
--- a/libmudflap/configure
|
|
+++ b/libmudflap/configure
|
|
@@ -15044,6 +15044,11 @@ old_archive_cmds=$lt_old_archive_cmds
|
|
# A language specific compiler.
|
|
CC=$lt_compiler
|
|
|
|
+# Ugly hack to get libmudflap (and other libraries) to build.
|
|
+# Libtool filters out \`-B' flags when linking (why?), so the \`-B' flag
|
|
+# to Glibc gets lost. Here we forcibly add it to any invocation.
|
|
+CC="\$CC $NIX_EXTRA_CFLAGS_TARGET $NIX_EXTRA_LDFLAGS_TARGET"
|
|
+
|
|
# Is the compiler the GNU compiler?
|
|
with_gcc=$GCC
|
|
|
|
diff --git a/libssp/configure b/libssp/configure
|
|
index ee2a41f..7f3e1fd 100755
|
|
--- a/libssp/configure
|
|
+++ b/libssp/configure
|
|
@@ -12926,6 +12926,11 @@ old_archive_cmds=$lt_old_archive_cmds
|
|
# A language specific compiler.
|
|
CC=$lt_compiler
|
|
|
|
+# Ugly hack to get libmudflap (and other libraries) to build.
|
|
+# Libtool filters out \`-B' flags when linking (why?), so the \`-B' flag
|
|
+# to Glibc gets lost. Here we forcibly add it to any invocation.
|
|
+CC="\$CC $NIX_EXTRA_CFLAGS_TARGET $NIX_EXTRA_LDFLAGS_TARGET"
|
|
+
|
|
# Is the compiler the GNU compiler?
|
|
with_gcc=$GCC
|
|
|