diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/include/function.defs | 5 | ||||
| -rwxr-xr-x | make/xcodemake | 22 |
2 files changed, 23 insertions, 4 deletions
diff --git a/make/include/function.defs b/make/include/function.defs index 5bf5aaa89..3be6a73e5 100644 --- a/make/include/function.defs +++ b/make/include/function.defs @@ -17,3 +17,8 @@ fn.ARGS = $(strip $(foreach a,$(2), \ fn.VARS = $(foreach v,$($(1).vars),$(v)="$($(1).vars.$(v))") fn.TARGET = $(TARGET.$(2).prefix)$(1)$(TARGET.$(2).suffix)$(TARGET.$(2).ext) + +define fn.PRINTLN +$(1) + +endef diff --git a/make/xcodemake b/make/xcodemake index a5950811b..f3aa4e6ae 100755 --- a/make/xcodemake +++ b/make/xcodemake @@ -106,15 +106,21 @@ if [ -n "$reconfigure" ]; then driver="--xcode-driver=$EXTERNAL_DRIVER" fi + ## determine which compiler to use based on Xcode environment (project). case "$GCC_VERSION" in com.apple.compilers.llvmgcc42) - gcc="--gcc=$DEVELOPER_BIN_DIR/llvm-gcc-4.2" + gcc="--gcc=`$DEVELOPER_BIN_DIR/xcodebuild -find-executable llvm-gcc-4.2`" ;; com.apple.compilers.llvm.clang.1_0) - gcc="--gcc=$DEVELOPER_BIN_DIR/clang" + gcc="--gcc=`$DEVELOPER_BIN_DIR/xcodebuild -find-executable clang`" ;; *) - gcc= + echo "*********************************************************************" + echo "***" + echo "*** ERROR: unexpected value for GCC_VERSION: $GCC_VERSION" + echo "***" + echo "*********************************************************************" + exit 1 ;; esac @@ -145,6 +151,14 @@ if [ -n "$reconfigure" ]; then minver= fi + ## pickup user setting from Xcode IDE and avoid recursion + if [ -n "$EXTERNAL_CONFIGURE" ]; then + extconf="$EXTERNAL_CONFIGURE" + else + extconf= + fi + EXTERNAL_CONFIGURE= + ## invoke configure with (hidden) option which indicates conf performed by xcode (set -ex; $EXTERNAL_SRC/configure --force \ $EXTERNAL_CONF_ARGS \ @@ -152,7 +166,7 @@ if [ -n "$reconfigure" ]; then $driver \ --xcode-symroot="$SYMROOT" \ --xcode-config="$EXTERNAL_XCCONFIG" \ - $gcc $arch $debug $sysroot $minver) + $gcc $arch $debug $sysroot $minver $extconf) [ $? -ne 0 ] && exit 1 fi |