summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorXavier Leroy <xavier.leroy@inria.fr>2001-10-30 09:32:32 +0000
committerXavier Leroy <xavier.leroy@inria.fr>2001-10-30 09:32:32 +0000
commit343d49401abf2c9d6841a4739c90f65fc88a666f (patch)
treeb378148fd4864173f54e73ea51d0a4c3be367ad4 /configure
parentf4e4e941cb5919dfe680a7968a057a1cc76af4c8 (diff)
downloadocaml-343d49401abf2c9d6841a4739c90f65fc88a666f.tar.gz
Revu gestion des DLLs: ne pas les utiliser en mode -custom; dans les .cma et .cmxa, stocker separement les options pour linker statiquement (-cclib) et par chargement dynamique (-dllib).
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3949 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure15
1 files changed, 8 insertions, 7 deletions
diff --git a/configure b/configure
index e3d93a24ed..f085ed88a2 100755
--- a/configure
+++ b/configure
@@ -368,7 +368,7 @@ shared_libraries_supported=false
sharedcccompopts=''
mksharedlib=''
byteccrpath=''
-sharedldtype='cc'
+mksharedlibrpath=''
if test $withsharedlibs = "yes"; then
case "$host" in
@@ -377,6 +377,7 @@ if test $withsharedlibs = "yes"; then
mksharedlib="gcc -shared -o"
bytecclinkopts="$bytecclinkopts -Wl,-E"
byteccrpath="-Wl,-rpath,"
+ mksharedlibrpath="-Wl,-rpath,"
shared_libraries_supported=true;;
alpha*-*-osf*)
case "$bytecc" in
@@ -385,7 +386,7 @@ if test $withsharedlibs = "yes"; then
esac
mksharedlib="ld -shared -expect_unresolved '*' -o"
byteccrpath="-Wl,-rpath,"
- sharedldtype="ld"
+ mksharedlibrpath="-rpath "
shared_libraries_supported=true;;
*-*-solaris2*)
case "$bytecc" in
@@ -394,17 +395,18 @@ if test $withsharedlibs = "yes"; then
if sh ./solaris-ld; then
mksharedlib="$bytecc -shared -o"
byteccrpath="-Wl,-R"
+ mksharedlibrpath="-R"
else
mksharedlib="$bytecc -shared -o"
bytecclinkopts="$bytecclinkopts -Wl,-E"
byteccrpath="-Wl,-rpath,"
+ mksharedlibrpath="-rpath "
fi
shared_libraries_supported=true;;
*)
sharedcccompopts="-KPIC"
byteccrpath="-Wl,-R"
mksharedlib="/usr/ccs/bin/ld -G -o"
- sharedldtype="ld"
shared_libraries_supported=true;;
esac;;
mips-sgi-irix[56]*)
@@ -414,7 +416,7 @@ if test $withsharedlibs = "yes"; then
esac
mksharedlib="ld -shared -rdata_shared -o"
byteccrpath="-Wl,-rpath,"
- sharedldtype="ld"
+ mksharedlibrpath="-rpath "
shared_libraries_supported=true;;
esac
fi
@@ -1122,8 +1124,7 @@ echo "EXE=$exe" >> Makefile
echo "SUPPORTS_SHARED_LIBRARIES=$shared_libraries_supported" >> Makefile
echo "SHAREDCCCOMPOPTS=$sharedcccompopts" >> Makefile
echo "MKSHAREDLIB=$mksharedlib" >> Makefile
-echo "SHAREDLDTYPE=$sharedldtype" >> Makefile
-
+echo "MKSHAREDLIBRPATH=$mksharedlibrpath" >> Makefile
echo "ARCH=$arch" >> Makefile
echo "MODEL=$model" >> Makefile
echo "SYSTEM=$system" >> Makefile
@@ -1163,7 +1164,7 @@ echo " options for linking....... $bytecclinkopts $cclibs $dllib $cursesl
if $shared_libraries_supported; then
echo " shared libraries are supported"
echo " options for compiling..... $sharedcccompopts $bytecccompopts"
-echo " command for building...... $mksharedlib <target>.so <objects>"
+echo " command for building...... $mksharedlib lib.so $mksharedlibrpath/a/path objs"
else
echo " shared libraries not supported"
fi