Author: hdu
Date: Fri Feb 14 13:44:34 2014
New Revision: 1568287
URL: http://svn.apache.org/r1568287
Log:
#i114728# force target compatibility when building with a newer OSX SDK
using OSX's MAC_OS_X_VERSION_MAX_ALLOWED define forces the build to be binary
compatibile to the configured deployment target, even when the SDK version
employed for building it is newer than the deployment target
Modified:
openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
openoffice/trunk/main/solenv/inc/unxmacc.mk
Modified: openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/macosx.mk?rev=1568287&r1=1568286&r2=1568287&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/macosx.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/macosx.mk Fri Feb 14 13:44:34
2014
@@ -111,6 +111,10 @@ endif
# (see toolkit module for a case where it is necessary to do it this way)
gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
+ifneq ($(MACOSX_DEPLOYMENT_TARGET),)
+ gb_CXXFLAGS += -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_$(subst
.,_,$(MACOSX_DEPLOYMENT_TARGET))
+endif
+
ifneq ($(EXTERNAL_WARNINGS_NOT_ERRORS),TRUE)
gb_CFLAGS_WERROR := -Werror
gb_CXXFLAGS_WERROR := -Werror
Modified: openoffice/trunk/main/solenv/inc/unxmacc.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/unxmacc.mk?rev=1568287&r1=1568286&r2=1568287&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/unxmacc.mk (original)
+++ openoffice/trunk/main/solenv/inc/unxmacc.mk Fri Feb 14 13:44:34 2014
@@ -36,10 +36,10 @@ LINKOUTPUT_FILTER=
# compiling STLport sources too, either internally or externally.
CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY
$(PROCESSOR_DEFINES) -D_USE_NAMESPACE=1
-# MAXOSX_DEPLOYMENT_TARGET : The minimum version required to run the build
result
-# (safer/easier than dealing with the MAC_OS_X_VERSION_MAX_ALLOWED macro)
-# http://developer.apple.com/technotes/tn2002/tn2064.html
-# done in setsolar/configure now. left here for documentation
+.IF "$(MACOSX_DEPLOYMENT_TARGET)" != ""
+ CDEFS += -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_$(subst,.,_
$(MACOSX_DEPLOYMENT_TARGET))
+.ENDIF
+
CDEFS+=-DQUARTZ
EXTRA_CDEFS*=-isysroot $(MACOSX_SDK_PATH)
