diff options
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 11 | ||||
| -rw-r--r-- | solenv/gbuild/platform/IOS_ARM_GCC.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_MSC.mk | 6 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_class.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 4 |
6 files changed, 11 insertions, 21 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 064ca8ebfc5c..deb42980b5ec 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -342,7 +342,6 @@ endef # gb_LinkTarget_CXXFLAGS # gb_LinkTarget_LDFLAGS # gb_LinkTarget_INCLUDE -# gb_LinkTarget_INCLUDE_STL .PHONY : $(call gb_LinkTarget_get_clean_target,%) $(call gb_LinkTarget_get_clean_target,%) : @@ -514,7 +513,6 @@ $(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $$ $(call gb_LinkTarget_get_headers_target,$(1)) \ $(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE) $(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : INCLUDE_STL := $$(gb_LinkTarget_INCLUDE_STL) $(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS := $$(gb_LinkTarget_LDFLAGS) $(call gb_LinkTarget__get_ldflags,$(2)) $(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS := $(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS := @@ -547,7 +545,6 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCFLAGS := $$(gb_LinkTarget_OBJC $(call gb_LinkTarget_get_dep_target,$(1)) : T_YACCFLAGS := $$(gb_LinkTarget_YYACFLAGS) $(YACCFLAGS) $(call gb_LinkTarget_get_dep_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $$(call gb_LinkTarget_rtl_defs,$(1)) $(CPPFLAGS) $(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE) -$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE_STL := $$(gb_LinkTarget_INCLUDE_STL) $(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE := $(call gb_LinkTarget_get_dep_target,$(1)) : LIBRARY_X64 := $(call gb_LinkTarget_get_dep_target,$(1)) : EXTRAOBJECTLISTS := @@ -658,12 +655,8 @@ endif endef define gb_LinkTarget_set_include_stl -$(call gb_LinkTarget_get_headers_target,$(1)) \ -$(call gb_LinkTarget_get_target,$(1)) : INCLUDE_STL := $(2) -ifeq ($(gb_FULLDEPS),$(true)) -$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE_STL := $(2) -endif - +$$(call gb_Output_error,\ + gb_LinkTarget_set_include_stl: removed, why is anybody calling it?) endef define gb_LinkTarget_add_ldflags diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index d0b653fd7217..9f2f54eef55b 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -103,7 +103,7 @@ $(call gb_Helper_abbreviate_dirs,\ -MMD -MT $(1) \ -MP -MF $(4) \ -I$(dir $(3)) \ - $(INCLUDE_STL) $(INCLUDE)) + $(INCLUDE)) endef # ObjCObject class @@ -121,7 +121,7 @@ $(call gb_Helper_abbreviate_dirs,\ -MMD -MT $(call gb_ObjCObject_get_target,$(2)) \ -MP -MF $(call gb_ObjCObject_get_dep_target,$(2)) \ -I$(dir $(3)) \ - $(INCLUDE_STL) $(INCLUDE)) + $(INCLUDE)) endef diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index d3ffc061ab9c..617f9c6443c7 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -303,7 +303,7 @@ $(call gb_Helper_abbreviate_dirs,\ -Fd$(PDBFILE) \ $(gb_COMPILERDEPFLAGS) \ -I$(dir $(3)) \ - $(INCLUDE_STL) $(INCLUDE) \ + $(INCLUDE) \ $(if $(filter YES,$(CXXOBJECT_X64)), -U_X86_ -D_AMD64_,) \ -c $(3) \ -Fo$(1)) $(call gb_create_deps,$(4),$(1),$(3)) @@ -329,11 +329,9 @@ gb_LinkTarget_CFLAGS := $(gb_CFLAGS) gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) gb_LinkTarget_INCLUDE :=\ - $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) \ + $(subst -I. , ,$(SOLARINC)) \ $(foreach inc,$(subst ;, ,$(JDKINC)),-I$(inc)) \ -gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC))) - gb_LinkTarget_get_pdbfile = $(call gb_LinkTarget_get_target,)pdb/$(1).pdb # avoid fatal error LNK1170 for Library_merged diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index a8f2d4b2622e..c3f10a42cccd 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -103,7 +103,7 @@ $(call gb_Helper_abbreviate_dirs,\ -o $(1) \ $(gb_cxx_dep_generation_options) \ -I$(dir $(3)) \ - $(INCLUDE_STL) $(INCLUDE) \ + $(INCLUDE) \ $(gb_cxx_dep_copy) \ ) endef @@ -119,7 +119,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(T_CXXFLAGS) \ -c $(2) \ -I$(dir $(2)) \ - $(INCLUDE_STL) $(INCLUDE) \ + $(INCLUDE) \ $(gb_COMPILER_PLUGINS) \ ) endef diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 5845a60d021b..24082a00754d 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -150,8 +150,7 @@ gb_DEBUG_CFLAGS := $(GGDB2) $(FINLINE_LIMIT0) $(FNO_INLINE) gb_DEBUG_CXXFLAGS := $(FNO_DEFAULT_INLINE) -gb_LinkTarget_INCLUDE := $(filter-out %/stl, $(subst -I. , ,$(SOLARINC))) -gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC))) +gb_LinkTarget_INCLUDE := $(subst -I. , ,$(SOLARINC)) ifeq ($(COM_GCC_IS_CLANG),TRUE) ifeq ($(COMPILER_PLUGIN_TOOL),) diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index a6cacc79df48..e122e253283e 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -118,7 +118,7 @@ $(call gb_Helper_abbreviate_dirs,\ -MMD -MT $(1) \ -MP -MF $(4) \ -I$(dir $(3)) \ - $(INCLUDE_STL) $(INCLUDE)) + $(INCLUDE)) endef # ObjCObject class @@ -137,7 +137,7 @@ $(call gb_Helper_abbreviate_dirs,\ -MMD -MT $(1) \ -MP -MF $(4) \ -I$(dir $(3)) \ - $(INCLUDE_STL) $(INCLUDE)) + $(INCLUDE)) endef |