Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

smlnj: Also allow no SDK directory

This should allow the command-line tools to work as well.
  • Loading branch information...
commit 50159c6ecf6b7d4207998e82861b9ce68ebf18c8 1 parent e6f2ad2
@Benabik authored
Showing with 6 additions and 3 deletions.
  1. +6 −3 Library/Formula/smlnj.rb
View
9 Library/Formula/smlnj.rb
@@ -69,7 +69,7 @@ def caveats
index ea5f8c3..0108774 100755
--- a/install.sh
+++ b/install.sh
-@@ -290,6 +290,14 @@ case $ARCH in
+@@ -290,6 +290,17 @@ case $ARCH in
esac
case $OPSYS in
@@ -77,9 +77,12 @@ def caveats
+ # find the SDK directory
+ SDKDIR=/Developer/SDKs
+ [ -d $SDKDIR ] || SDKDIR=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs
++ [ -d $SDKDIR ] || SDKDIR=
+ # finding the correct SDK
-+ SDKVERSION=`/usr/bin/sw_vers -productVersion | grep -o ^[0-9][0-9]\.[0-9]`
-+ EXTRA_DEFS="SDK=-isysroot ${SDKDIR}/MacOSX${SDKVERSION}.sdk -mmacosx-version-min=$SDKVERSION"
++ if [ "$SDKDIR" ]; then
++ SDKVERSION=`/usr/bin/sw_vers -productVersion | grep -o ^[0-9][0-9]\.[0-9]`
++ EXTRA_DEFS="SDK=-isysroot ${SDKDIR}/MacOSX${SDKVERSION}.sdk -mmacosx-version-min=$SDKVERSION"
++ fi
+ ;;
solaris)
MAKE=/usr/ccs/bin/make
Please sign in to comment.
Something went wrong with that request. Please try again.