b2e79ee47e
Most of the -nopie changes are from pascal@ (thanks); I only had to merge them for ghc-7.4 and tweak configure and mk/config.mk.in.
22 lines
1.1 KiB
Plaintext
22 lines
1.1 KiB
Plaintext
$OpenBSD: patch-configure,v 1.11 2012/09/02 19:53:46 kili Exp $
|
|
--- configure.orig Wed Jun 6 19:11:19 2012
|
|
+++ configure Sun Sep 2 17:59:39 2012
|
|
@@ -3759,7 +3759,7 @@ fi
|
|
$as_echo "$as_me: Building in-tree ghc-pwd" >&6;}
|
|
rm -rf utils/ghc-pwd/dist-boot
|
|
mkdir utils/ghc-pwd/dist-boot
|
|
- if ! "$WithGhc" -v0 -no-user-package-conf -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" -optl -nopie -v0 -no-user-package-conf -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
|
|
@@ -5582,7 +5582,7 @@ $as_echo_n "checking for extra options to pass gcc whe
|
|
if test "${fp_cv_gcc_extra_opts+set}" = set; 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
|