summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Pali <pgj@FreeBSD.org>2014-08-14 21:26:11 +0000
committerGabor Pali <pgj@FreeBSD.org>2014-08-14 21:26:11 +0000
commit80b1b8ce7b28e2737c74ff7f47366e39502162d6 (patch)
tree1bfc7d4176acff4494db58233830b5db900f0faa
parentUpdate 4.2.7p458 --> 4.2.7p461 (diff)
- Fix escaping linker options at configure; this fixes build with SSP
Submitted by: bdrewery Obtained from: FreeBSD Haskell
Notes
Notes: svn path=/head/; revision=364869
-rw-r--r--lang/ghc/files/patch-aclocal.m42
1 files changed, 1 insertions, 1 deletions
diff --git a/lang/ghc/files/patch-aclocal.m4 b/lang/ghc/files/patch-aclocal.m4
index a731bc9751c5..8dc8815f3e13 100644
--- a/lang/ghc/files/patch-aclocal.m4
+++ b/lang/ghc/files/patch-aclocal.m4
@@ -14,7 +14,7 @@
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'`
++ GHC_LDFLAGS=`echo $LDFLAGS | sed -E 's/\(^\| \)\([^ ]\)/\1-optl\2/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