diff options
Diffstat (limited to 'lang/ghc/files/patch-aclocal.m4')
| -rw-r--r-- | lang/ghc/files/patch-aclocal.m4 | 42 |
1 files changed, 12 insertions, 30 deletions
diff --git a/lang/ghc/files/patch-aclocal.m4 b/lang/ghc/files/patch-aclocal.m4 index 48c040f74504..a731bc9751c5 100644 --- a/lang/ghc/files/patch-aclocal.m4 +++ b/lang/ghc/files/patch-aclocal.m4 @@ -1,6 +1,6 @@ ---- aclocal.m4.orig 2013-04-18 23:22:46.000000000 +0200 -+++ aclocal.m4 2013-04-29 20:32:30.000000000 +0200 -@@ -19,6 +19,8 @@ +--- ./aclocal.m4.orig 2014-07-10 06:27:16.000000000 +0200 ++++ ./aclocal.m4 2014-07-11 11:23:41.000000000 +0200 +@@ -47,6 +47,8 @@ # In bindists, we haven't called AC_CANONICAL_{BUILD,HOST,TARGET} # so this justs uses $bootstrap_target. @@ -9,30 +9,12 @@ if test "$build_alias" = "" then if test "$bootstrap_target" != "" -@@ -157,7 +159,7 @@ - i386) - test -z "[$]2" || eval "[$]2=ArchX86" - ;; -- x86_64) -+ x86_64|amd64) - test -z "[$]2" || eval "[$]2=ArchX86_64" - ;; - powerpc) -@@ -185,7 +187,7 @@ - - checkVendor() { - case [$]1 in -- dec|unknown|hp|apple|next|sun|sgi|ibm) -+ dec|unknown|hp|apple|next|sun|sgi|ibm|portbld) - ;; - *) - echo "Unknown vendor [$]1" -@@ -1889,7 +1891,7 @@ - vax) - $2="vax" - ;; -- x86_64) -+ x86_64|amd64) - $2="x86_64" - ;; - *) +@@ -1817,7 +1819,7 @@ + dnl If special linker flags are needed to build things, then allow + dnl the user to pass them in via LDFLAGS. + changequote(, )dnl +- GHC_LDFLAGS=`echo $LDFLAGS | sed 's/\(^\| \)\([^ ]\)/\1-optl\2/g'` ++ GHC_LDFLAGS=`echo $LDFLAGS | sed 's/-Wl,-/-optl -/g'` + changequote([, ])dnl + if ! "$WithGhc" $GHC_LDFLAGS -v0 -no-user-$GHC_PACKAGE_DB_FLAG -hidir utils/ghc-pwd/dist-boot -odir utils/ghc-pwd/dist-boot -stubdir utils/ghc-pwd/dist-boot --make utils/ghc-pwd/Main.hs -o utils/ghc-pwd/dist-boot/ghc-pwd + then |