summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mst@openoffice.org>2011-04-11 13:23:37 +0000
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-17 10:33:03 +0200
commit49a5636500a72613769e3bc0637cd02e59fde3c5 (patch)
tree1d2a572f6e3328f3ab5eb166059dcf73f05a0aa7
parenta49a6b09359693b9f87f281438b8a5c491af2f69 (diff)
gnumake4: #i116959#: user defined LDFLAGS: [hg:5ed23c4158ac]
rename target local variable LDFLAGS. add gb_LinkTarget_add_ldflags. include user defined LDFLAGS in target local T_LDFLAGS.
-rw-r--r--sw/Library_vbaswobj.mk4
1 files changed, 1 insertions, 3 deletions
diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
index 140dd38d623d..f3ed77cedf9e 100644
--- a/sw/Library_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
@@ -114,10 +114,8 @@ $(eval $(call gb_Library_add_exception_objects,vbaswobj,\
))
ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_set_ldflags,vbaswobj,\
- $$(LDFLAGS) \
+$(eval $(call gb_Library_add_ldflags,vbaswobj,\
-Wl$(COMMA)-O1 \
- -Wl$(COMMA)-z$(COMMA)noexecstack \
))
endif