diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-21 12:54:01 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-21 12:54:01 +0200 |
| commit | 100fd14a70892a7c183574c3fc58672a04689211 (patch) | |
| tree | db452f9dbdd5535214fb1cec78080951e5e25456 /sc/Library_vbaobj.mk | |
| parent | ea1f63a45c3b1ab79c6428ec239a8a269de3c430 (diff) | |
gnumake4: postmerge fixes in sc
Diffstat (limited to 'sc/Library_vbaobj.mk')
| -rw-r--r-- | sc/Library_vbaobj.mk | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk index 6ef54b386626..437607ddc949 100644 --- a/sc/Library_vbaobj.mk +++ b/sc/Library_vbaobj.mk @@ -35,8 +35,7 @@ $(eval $(call gb_Library_set_include,vbaobj,\ $(eval $(call gb_Library_set_componentfile,vbaobj,sc/util/vbaobj)) -$(eval $(call gb_Library_set_defs,vbaobj,\ - $$(DEFS) \ +$(eval $(call gb_Library_add_defs,vbaobj,\ -DVBA_OOBUILD_HACK \ )) @@ -133,13 +132,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\ sc/source/ui/vba/vbawsfunction \ )) -ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) -$(eval $(call gb_Library_set_ldflags,vbaobj,\ - $$(LDFLAGS) \ - -Wl$(COMMA)-z$(COMMA)noexecstack \ -)) -endif - ifeq ($(OS),WNT) $(eval $(call gb_Library_add_linked_libs,vbaobj,\ advapi32 \ |