summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard PALO <richard@NetBSD.org>2015-02-22 09:23:32 +0100
committerMichael Stahl <mstahl@redhat.com>2015-02-26 13:18:19 +0000
commitf3cffeb3aeb67e979d43bb4b8e970cc466b14d45 (patch)
tree42f60c29a89b331056f7b806672ef8143a1dde08
parent530d3c92bd79f3c0e8d646e48a2eff1dae2921da (diff)
Reintegrate portion of a patch originally submitted by
Michael Stahl <mst@openoffice.org> Mar 30 2011 solaris11: #i117606#: solaris.mk: add -Bdirect -z defs to LDFLAGS Change-Id: Iab16960010810185a3b1f7c617c44db3d9822fb5 Reviewed-on: https://gerrit.libreoffice.org/14579 Tested-by: Jenkins <ci@libreoffice.org> Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--solenv/gbuild/platform/solaris.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index eef6826fafc7..d66345eee4d4 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -67,6 +67,8 @@ endif
gb_LinkTarget_LDFLAGS += \
-L$(SYSBASE)/lib \
-L$(SYSBASE)/usr/lib \
+ -Wl,-B,direct \
+ -Wl,-z,defs \
-Wl,-z,combreloc \
ifeq ($(HAVE_LD_HASH_STYLE),TRUE)