remove obsolete fiddling with CFLAGS

fixed upstream:
https://github.com/ocaml/ocaml/pull/8750
This commit is contained in:
chrisz 2022-01-11 19:01:28 +00:00
parent fa1c7dd79a
commit 4d6f554b64

View File

@ -1,33 +1,8 @@
$OpenBSD: patch-configure_ac,v 1.6 2021/12/10 04:10:59 daniel Exp $
$OpenBSD: patch-configure_ac,v 1.7 2022/01/11 19:01:28 chrisz Exp $
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -735,6 +735,11 @@ AS_CASE([$CC,$host],
)
+# Respect LDFLAGS and CFLAGS
+common_cflags="$common_cflags $CFLAGS"
+oc_ldflags="$oc_ldflags $LDFLAGS"
+
+
## Program to use to install files
AC_PROG_INSTALL
@@ -867,10 +872,10 @@ AS_IF([test x"$enable_shared" != "xno"],
[[*-*-linux*|*-*-freebsd[3-9]*|*-*-freebsd[1-9][0-9]*\
|*-*-openbsd*|*-*-netbsd*|*-*-dragonfly*|*-*-gnu*|*-*-haiku*]],
[sharedlib_cflags="-fPIC"
+ oc_ldflags="$oc_ldflags -Wl,-E"
AS_CASE([$CC,$host],
[gcc*,powerpc-*-linux*], [mksharedlib="$CC -shared -mbss-plt"],
- [mksharedlib="$CC -shared"])
- oc_ldflags="$oc_ldflags -Wl,-E"
+ [mksharedlib="$CC -shared $oc_ldflags"])
rpath="-Wl,-rpath,"
mksharedlibrpath="-Wl,-rpath,"
natdynlinkopts="-Wl,-E"
@@ -864,6 +869,7 @@ AS_IF([test x"$enable_shared" != "xno"],
[earm*-*-netbsd*], [natdynlink=true],
[aarch64-*-linux*], [natdynlink=true],