svn commit: r364869 - head/lang/ghc/files

Gabor Pali pgj at FreeBSD.org
Thu Aug 14 22:01:32 UTC 2014


Author: pgj
Date: Thu Aug 14 21:26:11 2014
New Revision: 364869
URL: http://svnweb.freebsd.org/changeset/ports/364869
QAT: https://qat.redports.org/buildarchive/r364869/

Log:
  - Fix escaping linker options at configure; this fixes build with SSP
  
  Submitted by:	bdrewery
  Obtained from:	FreeBSD Haskell

Modified:
  head/lang/ghc/files/patch-aclocal.m4

Modified: head/lang/ghc/files/patch-aclocal.m4
==============================================================================
--- head/lang/ghc/files/patch-aclocal.m4	Thu Aug 14 21:06:57 2014	(r364868)
+++ head/lang/ghc/files/patch-aclocal.m4	Thu Aug 14 21:26:11 2014	(r364869)
@@ -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


More information about the svn-ports-head mailing list