[MLton-commit] r4832

[Matthew F. <fl...@ml...>]

Add /sw/include to include path for runtime on Darwin
----------------------------------------------------------------------

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

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

Modified: mlton/trunk/bin/mlton-script
===================================================================
--- mlton/trunk/bin/mlton-script	2006-11-17 20:12:33 UTC (rev 4831)
+++ mlton/trunk/bin/mlton-script	2006-11-17 22:39:06 UTC (rev 4832)
@@ -67,10 +67,6 @@
 # You may need to add a line with -link-opt '-L/path/to/libgmp' so
 # that the linker can find libgmp.
 
-if [ -d '/sw/lib' ]; then
-        darwinLinkOpts='-L/sw/lib'
-fi
-
 doit "$lib" \
         -cc "$gcc"                                              \
         -cc-opt "-I$lib/include"                                \
@@ -99,7 +95,7 @@
         -target-link-opt aix '-lgmp'                            \
         -target-link-opt amd64 '-m32'                           \
         -target-link-opt cygwin '-lgmp'                         \
-        -target-link-opt darwin "$darwinLinkOpts -lgmp"         \
+        -target-link-opt darwin "-L/sw/lib -lgmp"               \
         -target-link-opt freebsd '-L/usr/local/lib/ -lgmp'      \
         -target-link-opt hpux '-lgmp'                           \
         -target-link-opt linux '-lgmp'                          \

Modified: mlton/trunk/bytecode/Makefile
===================================================================
--- mlton/trunk/bytecode/Makefile	2006-11-17 20:12:33 UTC (rev 4831)
+++ mlton/trunk/bytecode/Makefile	2006-11-17 22:39:06 UTC (rev 4832)
@@ -23,6 +23,10 @@
 CFLAGS += -mtune=opteron -m32 
 endif 
 
+ifeq ($(TARGET_OS), darwin)
+CFLAGS += -I/sw/include
+endif
+
 ifeq ($(TARGET_OS), freebsd)
 CFLAGS += -I/usr/local/include
 endif

Modified: mlton/trunk/runtime/Makefile
===================================================================
--- mlton/trunk/runtime/Makefile	2006-11-17 20:12:33 UTC (rev 4831)
+++ mlton/trunk/runtime/Makefile	2006-11-17 22:39:06 UTC (rev 4832)
@@ -31,6 +31,10 @@
 FLAGS += -mcpu=v8 -m32
 endif
 
+ifeq ($(TARGET_OS), darwin)
+FLAGS += -I/sw/include
+endif
+
 ifeq ($(TARGET_OS), freebsd)
 FLAGS += -I/usr/local/include
 endif