[MLton-commit] r6137

[Matthew Fluet]

Support /usr/local installs of GMP on MacOSX
----------------------------------------------------------------------

U   mlton/trunk/bin/mlton-script
U   mlton/trunk/runtime/Makefile

----------------------------------------------------------------------

Modified: mlton/trunk/bin/mlton-script
===================================================================
--- mlton/trunk/bin/mlton-script	2007-11-08 01:43:09 UTC (rev 6136)
+++ mlton/trunk/bin/mlton-script	2007-11-08 02:11:05 UTC (rev 6137)
@@ -70,6 +70,9 @@
 # The darwin linker complains (loudly) about non-existent library
 # search paths.
 darwinLinkOpts=''
+if [ -d '/usr/local/lib' ]; then
+        darwinLinkOpts="$darwinLinkOpts -L/usr/local/lib"
+fi
 if [ -d '/opt/local/lib' ]; then
         darwinLinkOpts="$darwinLinkOpts -L/opt/local/lib"
 fi
@@ -87,7 +90,9 @@
         -target-as-opt amd64 '-m64'                              \
         -target-cc-opt amd64 '-m64'                              \
         -target-cc-opt darwin                                    \
-                '-I/opt/local/include -I/sw/include'             \
+                '-I/usr/local/include 
+                 -I/opt/local/include 
+                 -I/sw/include'                                  \
         -target-cc-opt freebsd '-I/usr/local/include'            \
         -target-cc-opt netbsd '-I/usr/pkg/include'               \
         -target-cc-opt openbsd '-I/usr/local/include'            \

Modified: mlton/trunk/runtime/Makefile
===================================================================
--- mlton/trunk/runtime/Makefile	2007-11-08 01:43:09 UTC (rev 6136)
+++ mlton/trunk/runtime/Makefile	2007-11-08 02:11:05 UTC (rev 6137)
@@ -67,7 +67,7 @@
 endif
 
 ifeq ($(TARGET_OS), darwin)
-FLAGS += -I/sw/include -I/opt/local/include
+FLAGS += -I/usr/local/include -I/sw/include -I/opt/local/include
 endif
 
 ifeq ($(TARGET_OS), freebsd)