diff options
| author |  thutchin <thutchin@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2010-07-05 13:00:56 +0000 |
|---|---|---|
| committer | thutchin <thutchin@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2010-07-05 13:00:56 +0000 |
| commit | 4834725774ecbc2f0c415d8bd20317201d5381d9 (patch) | |
| tree | 059eda7e9e5b7d7b2f6b4f2c5036d5a4109229bf | |
| parent | 5c57ade1faa98699b14e9007fd109b02d87872ee (diff) | |
Turned off Mac dynlink hack for 10.6.3+ on x86_64
I don't have access to an x86_64 computer with 10.6
Maybe for 10.6.0/1/2 special cases aren't required
Reverted commit r13083
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@13243 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rwxr-xr-x | configure | 20 | ||||
| -rwxr-xr-x | dev/ocamlopt_shared_os5fix.sh | 2 |
2 files changed, 17 insertions, 5 deletions
@@ -479,10 +479,22 @@ fi case $HASNATDYNLINK,`uname -s`,`uname -r`,$CAMLVERSION in true,Darwin,9.*,3.11.*) # ocaml 3.11.0 dynlink on MacOS 10.5 is buggy NATDYNLINKFLAG=os5fixme;; - true,Darwin,10.3.*,3.11.*) # Not a problem on MacOS 10.6.3 - NATDYNLINKFLAG=$HASNATDYNLINK;; - true,Darwin,10.*,3.11.*) # Also a problem on previous Mac OS 10.6 versions - NATDYNLINKFLAG=os5fixme;; + #Possibly a problem on 10.6.0/10.6.1/10.6.2 + #May just be a 32 vs 64 problem for all 10.6.* + true,Darwin,10.0.*,3.11.*) # Possibly a problem on 10.6.0 + NATDYNLINKFLAG=os5fixme;; + true,Darwin,10.1.*,3.11.*) # Possibly a problem on 10.6.1 + NATDYNLINKFLAG=os5fixme;; + true,Darwin,10.2.*,3.11.*) # Possibly a problem on 10.6.2 + NATDYNLINKFLAG=os5fixme;; + true,Darwin,10.*,3.11.*) + if [ `getconf LONG_BIT` = "32" ]; then + # Still a problem for x86_32 + NATDYNLINKFLAG=os5fixme + else + # Not a problem for x86_64 + NATDYNLINKFLAG=$HASNATDYNLINK + fi;; *) NATDYNLINKFLAG=$HASNATDYNLINK;; esac diff --git a/dev/ocamlopt_shared_os5fix.sh b/dev/ocamlopt_shared_os5fix.sh index 2926804f5..f7d31ad81 100755 --- a/dev/ocamlopt_shared_os5fix.sh +++ b/dev/ocamlopt_shared_os5fix.sh @@ -25,5 +25,5 @@ cat $CMXS.startup.s | sed \ # Recompile fixed startup code as -o $CMXS.startup.o $CMXS.startup.fixed.s # Build fixed .cmxs (assume all object files are at the same place) -gcc -bundle -flat_namespace -undefined warning -read_only_relocs suppress -o $CMXS $OBJS $CMXS.startup.o +ld -bundle -flat_namespace -undefined warning -read_only_relocs suppress -o $CMXS $OBJS $CMXS.startup.o rm $CMXS.startup.o $CMXS.startup.s $CMXS.startup.fixed.s
\ No newline at end of file |