diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-12-19 11:43:51 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-12-19 14:28:13 +0100 |
commit | d5c86be04ee4ab4dba14bc70adc91bf5888dc31c (patch) | |
tree | dfdcb1010028531fa8f95e9f5f4bca2d3d085ded /solenv | |
parent | f9d3e0f57c173494d250aadd0022abb738634f43 (diff) |
No need for RTL_USING in addition to LIBO_INTERNAL_ONLY
Change-Id: Iaa65658aed6bb4abb20a4d95dc9c6caf7c1c764b
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/gbuild/LinkTarget.mk | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 104c5b663e93..1859c8b7a162 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -386,10 +386,6 @@ endif gb_LinkTarget_DEFAULTDEFS := $(gb_GLOBALDEFS) -define gb_LinkTarget_rtl_defs -$(if $(filter-out sal salhelper cppu cppuhelper odk, $(gb_Module_CURRENTMODULE_NAME)), -DRTL_USING) -endef - .PHONY : $(WORKDIR)/Clean/LinkTarget/% $(WORKDIR)/Clean/LinkTarget/% : $(call gb_Output_announce,$*,$(false),LNK,4) @@ -596,7 +592,7 @@ $(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXX $(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS_APPEND := $(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS := $$(gb_LinkTarget_OBJCFLAGS) $(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS_APPEND := -$(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $$(call gb_LinkTarget_rtl_defs,$(1)) $(CPPFLAGS) +$(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS) $(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS) $(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE) $(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS := $$(gb_LinkTarget_LDFLAGS) $(call gb_LinkTarget_get_linksearchpath_for_layer,$(3)) $(call gb_LinkTarget__get_ldflags,$(2)) |