summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRelease Engineers <releng@openoffice.org>2009-09-21 07:06:14 +0000
committerRelease Engineers <releng@openoffice.org>2009-09-21 07:06:14 +0000
commit2e0cc1025a1794ce747fc421aa92422276fdcead (patch)
tree8963ea964d66425a39aa9be36ca032d33296cd29
parent1044f02912671f1d1633d7a801cade7468f2d93c (diff)
#i10000# EXTRA_CDEFS,EXTRA_LINKFLAGS are set as environment variable in HH RE environment
-rw-r--r--solenv/inc/unxmacx.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index 95f2aa76a150..6cb113e7918b 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -55,7 +55,7 @@ CDEFS+=-DX_LOCALE
MACOSX_DEPLOYMENT_TARGET=10.4
.EXPORT: MACOSX_DEPLOYMENT_TARGET
CDEFS+=-DQUARTZ
-EXTRA_CDEFS+=-isysroot /Developer/SDKs/MacOSX10.4u.sdk
+EXTRA_CDEFS*=-isysroot /Developer/SDKs/MacOSX10.4u.sdk
.ENDIF
# Name of library where static data members are initialized
@@ -201,7 +201,7 @@ LINKC*=$(CC)
LINKFLAGSDEFS*=-Wl,-multiply_defined,suppress
# assure backwards-compatibility
-EXTRA_LINKFLAGS+=-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk
+EXTRA_LINKFLAGS*=-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk
# 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)'