[ooo-build-commit] Branch 'ooo/master' - solenv/inc

[Jan Holesovsky]

 solenv/inc/unxmacx.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 754cc191825beb108a981a55c50a2806a7b825b4
Author: Release Engineers <releng at openoffice.org>
Date:   Mon Sep 21 07:06:14 2009 +0000

    #i10000# EXTRA_CDEFS,EXTRA_LINKFLAGS are set as environment variable in HH RE environment

diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index 95f2aa7..6cb113e 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)'