From 99c8916342ce6b13661aa1076b4e8444c6e97cb6 Mon Sep 17 00:00:00 2001
From: letouzey
Date: Mon, 30 Mar 2009 19:33:48 +0000
Subject: Fix the fix script for ocamlopt -shared in MacOS 10.5 (remarks by
 Hugo)

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12041 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 dev/ocamlopt_shared_os5fix.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'dev')

diff --git a/dev/ocamlopt_shared_os5fix.sh b/dev/ocamlopt_shared_os5fix.sh
index db4cb159c4..6782d2fa07 100755
--- a/dev/ocamlopt_shared_os5fix.sh
+++ b/dev/ocamlopt_shared_os5fix.sh
@@ -4,9 +4,15 @@
 
 OCAMLOPT=$1
 CMXS=$2
-CMXA=$3
 
-$OCAMLOPT -dstartup -linkall -shared -o $CMXS $CMXA
+DIR=`dirname $CMXS`
+BASE=`basename $CMXS .cmxs`
+CMXA=$DIR/$BASE.cmxa
+ARC=$DIR/$BASE.a
+# we assume that all object files are at the same place than the rest
+OBJS=`ar t $ARC | sed -e "s|^|$DIR/|"`
+
+"$OCAMLOPT" -dstartup -linkall -shared -o $CMXS $CMXA
 # Fix1: add a dummy instruction before the caml generic functions
 # Fix2: make all caml generic functions private
 rm -f $CMXS $CMXS.startup.fixed.s
@@ -18,6 +24,6 @@ cat $CMXS.startup.s | sed \
  > $CMXS.startup.fixed.s
 # Recompile fixed startup code
 as -o $CMXS.startup.o $CMXS.startup.fixed.s
-# Build fixed .cmxs (assume plugins are on directory base and include all files)
-ld -bundle -flat_namespace -undefined warning -read_only_relocs suppress -o $CMXS `dirname $CMXS`/*.o
+# Build fixed .cmxs (assume all object files are at the same place)
+ld -bundle -flat_namespace -undefined warning -read_only_relocs suppress -o $CMXS $OBJS
 rm $CMXS.startup.o $CMXS.startup.s $CMXS.startup.fixed.s
\ No newline at end of file
-- 
cgit v1.2.3