summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlain Frisch <alain@frisch.fr>2010-05-25 11:10:59 +0000
committerAlain Frisch <alain@frisch.fr>2010-05-25 11:10:59 +0000
commit3e12ede6e771bfd9fbf21d3df56270bf7b93eff6 (patch)
treed5d3583e85e21adc29f2bed85ea40e6939b21c8f
parent47dbbc7d7f08b5eae905979eb09921ee50cd0d43 (diff)
More explicit list of hosts where natdynlink is enabled.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10462 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rwxr-xr-xconfigure18
1 files changed, 14 insertions, 4 deletions
diff --git a/configure b/configure
index b6dc698fd..289085545 100755
--- a/configure
+++ b/configure
@@ -511,17 +511,14 @@ mksharedlib=''
byteccrpath=''
mksharedlibrpath=''
natdynlinkopts=""
-natdynlink=false
if test $withsharedlibs = "yes"; then
case "$host" in
*-*-cygwin*)
- natdynlink=true
mksharedlib="$flexlink"
mkmaindll="$flexlink -maindll"
shared_libraries_supported=true;;
*-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-openbsd*|*-*-netbsd*|*-*-gnu*)
- natdynlink=true
sharedcccompopts="-fPIC"
mksharedlib="$bytecc -shared"
bytecclinkopts="$bytecclinkopts -Wl,-E"
@@ -614,12 +611,25 @@ if test -z "$mkmaindll"; then
mkmaindll=$mksharedlib
fi
+# Configure native dynlink
+
+natdynlink=false
+
+if test $withsharedlibs = "yes"; then
+ case "$host" in
+ *-*-cygwin*) natdynlink=true;;
+ i[3456]86-*-linux*) natdynlink=true;;
+ x86_64-*-linux*) natdynlink=true;;
+ esac
+fi
+
if test $natdynlink = "true"; then
cmxs="cmxs"
else
cmxs="cmxa"
fi
+
# Configure the native-code compiler
arch=none
@@ -638,7 +648,7 @@ case "$host" in
sparc*-*-*bsd*) arch=sparc; system=bsd;;
sparc*-*-linux*) arch=sparc; system=linux;;
sparc*-*-gnu*) arch=sparc; system=gnu;;
- i[3456]86-*-linux*) arch=i386; system=linux_`sh ./runtest elf.c`;;
+ i[3456]86-*-linux*) arch=i386; system=linux_`sh ./runtest elf.c`; natdynlink=true;;
i[3456]86-*-*bsd*) arch=i386; system=bsd_`sh ./runtest elf.c`;;
i[3456]86-*-nextstep*) arch=i386; system=nextstep;;
i[3456]86-*-solaris*) if $arch64; then