ocamlbuild: many improvements (macos 10.5 fix, correct dllpath, etc)

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12033 85f007b7-540e-0410-9357-904b9bb8a0f7

Makefile.build

@@ -836,24 +836,10 @@ endif
 
 %.cmxs: %.cmxa
 	$(SHOW)'OCAMLOPT -shared -o $@'
-ifneq ($(HASNATDYNLINK),os5fixme)
-	$(HIDE)$(OCAMLOPT) -linkall -shared -o $@ $<
+ifeq ($(HASNATDYNLINK),os5fixme)
+	$(HIDE)dev/ocamlopt_shared_os5fix.sh $(OCAMLOPT) $@ $<
 else
-	$(HIDE)$(OCAMLOPT) -dstartup -linkall -shared -o $@ $<
-#	Fix1: add a dummy instruction before the caml generic functions
-#	Fix2: make all caml generic functions private
-	$(HIDE)rm -f $@ $@.startup.fixed.s
-	$(HIDE)cat $@.startup.s | sed \
-	  -e "s/_caml_shared_startup__code_begin:/_caml_shared_startup__code_begin:	ret/" \
-	  -e "s/.globl	_caml_curry/.private_extern	_caml_curry/" \
-	  -e "s/.globl	_caml_apply/.private_extern	_caml_apply/" \
-	  -e "s/.globl	_caml_tuplify/.private_extern	_caml_tuplify/" \
-	  > $@.startup.fixed.s
-#	Recompile fixed startup code
-	$(HIDE)as -o $@.startup.o $@.startup.fixed.s
-#	Build fixed .cmxs (assume plugins are on directory base and include all files)
-	$(HIDE)ld -bundle -flat_namespace -undefined warning -read_only_relocs suppress -o $@ `dirname $@`/*.o
-	$(HIDE)rm $@.startup.o $@.startup.s $@.startup.fixed.s
+	$(HIDE)$(OCAMLOPT) -linkall -shared -o $@ $<
 endif
 
 %.cmxs: %.cmx

_tags

@@ -50,8 +50,8 @@
 ## sub-directory inclusion
 
 # Note: "checker" is deliberately not included
+# Note: same for "config" (we create a special coq_config.ml)
 
-"config": include
 "parsing": include
 "ide": include
 "ide/utils": include

coq.itarget

@@ -1,2 +1,2 @@
-bin.otarget
+binaries
 vo.otarget

dev/ocamlopt_shared_os5fix.sh

@@ -0,0 +1,23 @@
+#/bin/sh
+
+### Temporary fix for production of .cmxs on MacOS 10.5
+
+OCAMLOPT=$1
+CMXS=$2
+CMXA=$3
+
+$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
+cat $CMXS.startup.s | sed \
+ -e "s/_caml_shared_startup__code_begin:/_caml_shared_startup__code_begin:	ret/" \
+ -e "s/.globl	_caml_curry/.private_extern	_caml_curry/" \
+ -e "s/.globl	_caml_apply/.private_extern	_caml_apply/" \
+ -e "s/.globl	_caml_tuplify/.private_extern	_caml_tuplify/" \
+ > $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
+rm $CMXS.startup.o $CMXS.startup.s $CMXS.startup.fixed.s