diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-07-25 20:50:59 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-07-26 15:54:55 -0500 |
| commit | ee707ab085f582e322fbfac8759bf29d37c79444 (patch) | |
| tree | 91367af59dd1234aae10536ab92b6e076db7ad81 /solenv/inc | |
| parent | MacOSX configure options to support SDK and version min/max (diff) | |
| download | core-ee707ab085f582e322fbfac8759bf29d37c79444.tar.gz core-ee707ab085f582e322fbfac8759bf29d37c79444.zip | |
Use MACOSX_SDK_PATH and other configured variables in mac build
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/unxmacx.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk index c862f948b571..cf196d4cd9df 100644 --- a/solenv/inc/unxmacx.mk +++ b/solenv/inc/unxmacx.mk @@ -48,8 +48,10 @@ CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFI # done in setsolar/configure now. left here for documentation #MACOSX_DEPLOYMENT_TARGET=10.4 #.EXPORT: MACOSX_DEPLOYMENT_TARGET -CDEFS+=-DQUARTZ -EXTRA_CDEFS*=-isysroot /Developer/SDKs/MacOSX10.4u.sdk +CDEFS+=-DQUARTZ +CDEFS+:= -DMAC_OS_X_VERSION_MIN_REQUIRED=$(MAC_OS_X_VERSION_MIN_REQUIRED) -DMAC_OS_X_VERSION_MAX_ALLOWED=$(MAC_OS_X_VERSION_MAX_ALLOWED) + +EXTRA_CDEFS*:=-isysroot $(MACOSX_SDK_PATH) .ENDIF # Name of library where static data members are initialized @@ -174,7 +176,7 @@ LINKC*=$(CC) LINKFLAGSDEFS*=-Wl,-multiply_defined,suppress # assure backwards-compatibility -EXTRA_LINKFLAGS*=-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk +EXTRA_LINKFLAGS*:=-Wl,-syslibroot,$(MACOSX_SDK_PATH) # Very long install_names are needed so that install_name_tool -change later on # does not complain that "larger updated load commands do not fit:" LINKFLAGSRUNPATH_URELIB=-install_name '@__________________________________________________URELIB/$(@:f)' |