From b7699f854561ffe7c918b3c5f9b5e1753404c201 Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Sat, 10 Jun 2017 19:07:51 +0100 Subject: [PATCH] don't set OSXSDKPATH by default --- build-devkit.sh | 11 ++++++++--- config.sh.sample | 8 +++++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/build-devkit.sh b/build-devkit.sh index 47177db..424f4b5 100755 --- a/build-devkit.sh +++ b/build-devkit.sh @@ -57,7 +57,6 @@ GP32_TOOLS_VER=1.0.2 LIBMIRKO_VER=0.9.7 OSXMIN=${OSXMIN:-10.5} -OSXSDKPATH=${OSXSDKPATH:-/Developer/SDKs/MacOSX10.5.sdk} #--------------------------------------------------------------------------------- function extract_and_patch { @@ -168,8 +167,12 @@ PLATFORM=`uname -s` case $PLATFORM in Darwin ) - cflags="-mmacosx-version-min=${OSXMIN} -isysroot ${OSXSDKPATH} -I/usr/local/include" - ldflags="-mmacosx-version-min=${OSXMIN} -Wl,-syslibroot,${OSXSDKPATH} -L/usr/local/lib" + cflags="-mmacosx-version-min=${OSXMIN} -I/usr/local/include" + ldflags="-mmacosx-version-min=${OSXMIN} -L/usr/local/lib" + if [ "x${OSXSDKPATH}x" != "xx" ]; then + cflags="$cflags -isysroot ${OSXSDKPATH}" + ldflags="$ldflags -Wl,-syslibroot,${OSXSDKPATH}" + fi TESTCC=`cc -v 2>&1 | grep clang` if [ "x${TESTCC}x" != "xx" ]; then cflags="$cflags -fbracket-depth=512" @@ -182,8 +185,10 @@ case $PLATFORM in ;; esac + BUILDSCRIPTDIR=$(pwd) BUILDDIR=$(pwd)/.$package + if [ ! -z $CROSSBUILD ]; then BUILDDIR=$BUILDDIR-$CROSSBUILD fi diff --git a/config.sh.sample b/config.sh.sample index 311225b..05d7117 100755 --- a/config.sh.sample +++ b/config.sh.sample @@ -22,7 +22,7 @@ BUILD_DKPRO_PACKAGE=0 #--------------------------------------------------------------------------------- # Path to previously downloaded source packages, comment if not specified #--------------------------------------------------------------------------------- -#BUILD_DKPRO_SRCDIR=/d/projects/archives +#BUILD_DKPRO_SRCDIR=~/projects/archives #--------------------------------------------------------------------------------- # MAKEFLAGS for building - use number of processors for jobs @@ -38,3 +38,9 @@ BUILD_DKPRO_PACKAGE=0 #--------------------------------------------------------------------------------- BUILD_DKPRO_AUTOMATED=0 + +#--------------------------------------------------------------------------------- +# set OSX SDK path if needed +#--------------------------------------------------------------------------------- +#export OSXSDKPATH=/Library/Developer/CommandLineTools/SDKs/MacOSX10.12.sdk +