mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 22:20:51 +00:00
33 lines
1.5 KiB
Diff
33 lines
1.5 KiB
Diff
diff -Nuar ocaml-3.12.1/configure ocaml-3.12.1-fix-configure/configure
|
|
--- ocaml-3.12.1/configure 2011-07-04 23:15:01.000000000 +0200
|
|
+++ ocaml-3.12.1-fix-configure/configure 2012-06-06 22:20:40.000000000 +0200
|
|
@@ -259,7 +259,7 @@
|
|
bytecccompopts="-fno-defer-pop $gcc_warnings -DSHRINKED_GNUC"
|
|
mathlib="";;
|
|
*,*-*-darwin*)
|
|
- bytecccompopts="-fno-defer-pop -no-cpp-precomp $gcc_warnings"
|
|
+ bytecccompopts="-fno-defer-pop $gcc_warnings"
|
|
mathlib=""
|
|
# Tell gcc that we can use 32-bit code addresses for threaded code
|
|
# unless we are compiled for a shared library (-fPIC option)
|
|
@@ -739,7 +739,7 @@
|
|
*,*,rhapsody,*) nativecccompopts="$gcc_warnings -DDARWIN_VERSION_6 $dl_defs"
|
|
if $arch64; then partialld="ld -r -arch ppc64"; fi;;
|
|
*,gcc*,cygwin,*) nativecccompopts="$gcc_warnings -U_WIN32";;
|
|
- amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";;
|
|
+ amd64,gcc*,macosx,*) partialld="ld -r";;
|
|
amd64,gcc*,solaris,*) partialld="ld -r -m elf_x86_64";;
|
|
*,gcc*,*,*) nativecccompopts="$gcc_warnings";;
|
|
esac
|
|
@@ -752,8 +752,8 @@
|
|
asppprofflags='-pg -DPROFILING';;
|
|
alpha,*,*) as='as'
|
|
aspp='gcc -c';;
|
|
- amd64,*,macosx) as='as -arch x86_64'
|
|
- aspp='gcc -arch x86_64 -c';;
|
|
+ amd64,*,macosx) as='as'
|
|
+ aspp='gcc -c';;
|
|
amd64,*,solaris) as='as --64'
|
|
aspp='gcc -m64 -c';;
|
|
amd64,*,*) as='as'
|