04c1e03900
Also, use a new(er) bootstrapper; note that we have to use 7.8.3 for this, because if the built ghc and the bootstrapper have identical versions, things will fail badly. May be it's not the ghc but the cabal version which is problematic, but at the moment, I really don'y call about *this* problem. Still marked as broken. I hope to send promised diffs and new ports for discussion tomorrow and then enable ghc and haskell-platform on monday.
22 lines
1.3 KiB
Plaintext
22 lines
1.3 KiB
Plaintext
$OpenBSD: patch-configure,v 1.14 2015/01/01 19:25:36 kili Exp $
|
|
--- configure.orig Tue Dec 23 14:50:12 2014
|
|
+++ configure Mon Dec 29 10:24:49 2014
|
|
@@ -4124,7 +4124,7 @@ $as_echo "$as_me: Building in-tree ghc-pwd" >&6;}
|
|
rm -rf utils/ghc-pwd/dist-boot
|
|
mkdir utils/ghc-pwd/dist-boot
|
|
GHC_LDFLAGS=`echo $LDFLAGS | sed 's/\(^\| \)\([^ ]\)/\1-optl\2/g'`
|
|
- 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
|
|
+ if ! "$WithGhc" $GHC_LDFLAGS -optl -nopie -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
|
|
as_fn_error $? "Building ghc-pwd failed" "$LINENO" 5
|
|
fi
|
|
@@ -7329,7 +7329,7 @@ $as_echo_n "checking for extra options to pass gcc whe
|
|
if ${fp_cv_gcc_extra_opts+:} false; then :
|
|
$as_echo_n "(cached) " >&6
|
|
else
|
|
- fp_cv_gcc_extra_opts=
|
|
+ fp_cv_gcc_extra_opts=-fno-pie
|
|
fp_version1=$fp_cv_gcc_version; fp_version2=3.4
|
|
fp_save_IFS=$IFS; IFS='.'
|
|
while test x"$fp_version1" != x || test x"$fp_version2" != x
|