[Libreoffice-commits] .: Branch 'libreoffice-3-4' - solenv/gbuild

[Robert Nagy]

 solenv/gbuild/platform/unxgcc.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 31332503a7a297f6a6f8c6bf765017171288f6cf
Author: Robert Nagy <robert at openbsd.org>
Date:   Sun Apr 3 22:13:19 2011 +0200

    add -Wl,--sysroot=$(SYSBASE) to gb_LinkTarget_LDFLAGS only if SYSBASE is !nil

diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 5b5d76f..e52684f 100755
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -105,6 +105,8 @@ endif
 ifneq ($(strip $(SYSBASE)),)
 gb_CXXFLAGS += --sysroot=$(SYSBASE)
 gb_CFLAGS += --sysroot=$(SYSBASE)
+gb_LinkTarget_LDFLAGS += \
+	-Wl,--sysroot=$(SYSBASE)
 endif
 gb_LinkTarget_EXCEPTIONFLAGS := \
 	-DEXCEPTIONS_ON \
@@ -116,7 +118,6 @@ gb_LinkTarget_NOEXCEPTIONFLAGS := \
 	-fno-exceptions \
 
 gb_LinkTarget_LDFLAGS += \
-	-Wl,--sysroot=$(SYSBASE) \
 	-Wl,-rpath-link,$(SYSBASE)/lib:$(SYSBASE)/usr/lib \
 	-Wl,-z,combreloc \
 	$(subst -L../lib , ,$(SOLARLIB)) \