diff options
Diffstat (limited to 'testing/ocaml/020_all_configure.patch')
| -rw-r--r-- | testing/ocaml/020_all_configure.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/testing/ocaml/020_all_configure.patch b/testing/ocaml/020_all_configure.patch index 2ae0c49432..5c4dbf064e 100644 --- a/testing/ocaml/020_all_configure.patch +++ b/testing/ocaml/020_all_configure.patch @@ -2,20 +2,20 @@ The configure script doesn't inherit previous defined variables, overwriting previous declarations of bytecccompopts, bytecclinkopts, nativecccompopts and nativecclinkopts. Reported upstream as issue 0004267. -Index: ocaml-3.12.0/configure +Index: ocaml-4.02.2/configure =================================================================== ---- ocaml-3.12.0.orig/configure -+++ ocaml-3.12.0/configure -@@ -241,7 +241,7 @@ esac +--- ocaml-4.02.2.orig/configure ++++ ocaml-4.02.2/configure +@@ -314,7 +314,7 @@ esac # Configure the bytecode compiler bytecc="$cc" -mkexe="\$(BYTECC)" +mkexe="\$(BYTECC) \$(BYTECCLINKOPTS)" + mkexedebugflag="-g" bytecccompopts="" bytecclinkopts="" - dllccompopts="" -@@ -1582,7 +1582,15 @@ fi +@@ -1694,7 +1694,15 @@ sharedcccompopts="-O $sharedcccompopts" # Final twiddling of compiler options to work around known bugs @@ -31,7 +31,7 @@ Index: ocaml-3.12.0/configure case "$buggycc" in gcc.2.96) bytecccompopts="$bytecccompopts -fomit-frame-pointer" -@@ -1618,6 +1626,7 @@ echo "NATIVECC=$nativecc" >> Makefile +@@ -1730,6 +1738,7 @@ echo "NATIVECC=$nativecc" >> Makefile echo "NATIVECCCOMPOPTS=$nativecccompopts" >> Makefile echo "NATIVECCPROFOPTS=$nativeccprofopts" >> Makefile echo "NATIVECCLINKOPTS=$nativecclinkopts" >> Makefile @@ -39,7 +39,7 @@ Index: ocaml-3.12.0/configure echo "NATIVECCRPATH=$nativeccrpath" >> Makefile echo "NATIVECCLIBS=$cclibs $dllib" >> Makefile echo "ASM=$as" >> Makefile -@@ -1630,7 +1639,7 @@ echo "DEBUGGER=$debugger" >> Makefile +@@ -1741,7 +1750,7 @@ echo "OTHERLIBRARIES=$otherlibraries" >> echo "CC_PROFILE=$cc_profile" >> Makefile echo "SYSTHREAD_SUPPORT=$systhread_support" >> Makefile echo "PARTIALLD=$partialld" >> Makefile |