incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1179186 - /incubator/ooo/trunk/main/solenv/gbuild/platform/linux.mk
Date Wed, 05 Oct 2011 12:13:15 GMT
Author: hdu
Date: Wed Oct  5 12:13:14 2011
New Revision: 1179186

URL: http://svn.apache.org/viewvc?rev=1179186&view=rev
Log:
allow gbuild with empty sysroot on linux

Modified:
    incubator/ooo/trunk/main/solenv/gbuild/platform/linux.mk

Modified: incubator/ooo/trunk/main/solenv/gbuild/platform/linux.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/gbuild/platform/linux.mk?rev=1179186&r1=1179185&r2=1179186&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/gbuild/platform/linux.mk (original)
+++ incubator/ooo/trunk/main/solenv/gbuild/platform/linux.mk Wed Oct  5 12:13:14 2011
@@ -110,6 +110,7 @@ endif
 ifneq ($(strip $(SYSBASE)),)
 gb_CXXFLAGS += --sysroot=$(SYSBASE)
 gb_CFLAGS += --sysroot=$(SYSBASE)
+gb_LinkTarget_LDFLAGS := -Wl,--sysroot=$(SYSBASE)
 endif
 gb_LinkTarget_EXCEPTIONFLAGS := \
 	-DEXCEPTIONS_ON \
@@ -120,8 +121,7 @@ gb_LinkTarget_NOEXCEPTIONFLAGS := \
 	-DEXCEPTIONS_OFF \
 	-fno-exceptions \
 
-gb_LinkTarget_LDFLAGS := \
-	-Wl,--sysroot=$(SYSBASE) \
+gb_LinkTarget_LDFLAGS += \
 	-Wl,-rpath-link,$(SYSBASE)/lib:$(SYSBASE)/usr/lib \
 	-Wl,-z,combreloc \
 	-Wl,-z,defs \



Mime
View raw message