diff options
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_class.mk | 6 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 4b48f6784a26..269a06ddb485 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -910,7 +910,7 @@ endef # gb_LinkTarget_add_scanner(<component>,<scanner file>) define gb_LinkTarget_add_scanner $(call gb_LexTarget_LexTarget,$(2)) -$(call gb_LinkTarget_add_generated_exception_object,$(1),LexTarget/$(2),$(3)) +$(call gb_LinkTarget_add_generated_exception_object,$(1),LexTarget/$(2),$(3),-Wno-error) $(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_LexTarget_get_clean_target,$(2)) endef @@ -1010,7 +1010,7 @@ $(foreach obj,$(2),$(call gb_LinkTarget_add_generated_cxx_object,$(1),$(obj),$(3 endef define gb_LinkTarget_add_generated_exception_object -$(call gb_LinkTarget_add_generated_cxx_object,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(call gb_LinkTarget__get_cxxflags,$(3))) +$(call gb_LinkTarget_add_generated_cxx_object,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(call gb_LinkTarget__get_cxxflags,$(3)) $(4)) endef define gb_LinkTarget_add_generated_exception_objects diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 7848537839eb..b864ba411a23 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -31,8 +31,8 @@ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) $(dir $(4)) && \ $(gb_CC) \ $(DEFS) \ - $(T_CFLAGS) \ $(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \ + $(T_CFLAGS) \ -c $(3) \ -o $(1) \ -I$(dir $(3)) \ @@ -50,8 +50,8 @@ $(call gb_Helper_abbreviate_dirs,\ $(gb_CC) \ $(DEFS) \ $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \ - $(T_CFLAGS) \ $(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \ + $(T_CFLAGS) \ -c $(3) \ -o $(1) \ -MMD -MT $(1) \ @@ -71,8 +71,8 @@ $(call gb_Helper_abbreviate_dirs,\ $(gb_CXX) \ $(DEFS) \ $(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \ - $(T_CXXFLAGS) \ $(if $(WARNINGS_NOT_ERRORS),,$(gb_CXXFLAGS_WERROR)) \ + $(T_CXXFLAGS) \ -c $(3) \ -o $(1) \ -MMD -MT $(1) \ diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 6e4a741aaa7e..3650cf1c313f 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -117,8 +117,8 @@ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) $(dir $(4)) && \ $(gb_CXX) \ $(DEFS) \ - $(T_OBJCXXFLAGS) \ $(if $(WARNINGS_NOT_ERRORS),,$(gb_CXXFLAGS_WERROR)) \ + $(T_OBJCXXFLAGS) \ -c $(3) \ -o $(1) \ -MMD -MT $(1) \ @@ -135,8 +135,8 @@ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) $(dir $(4)) && \ $(gb_CC) \ $(DEFS) \ - $(T_OBJCFLAGS) \ $(if $(WARNINGS_NOT_ERRORS),,$(gb_CFLAGS_WERROR)) \ + $(T_OBJCFLAGS) \ -c $(3) \ -o $(1) \ -MMD -MT $(1) \ |