diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-11-12 15:00:25 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-11-12 17:37:11 +0000 |
| commit | ba8a957bfaffdddd10782ccb06d80d54e5805fcd (patch) | |
| tree | ee9e4e2670c9f421281824c5192f9fb581312635 /solenv | |
| parent | 51af0ef35b5a7ed0d1468f11cca73ba0158e8be4 (diff) | |
Generalize COM_GCC_IS_CLANG -> COM_IS_CLANG
...in anticipation of building with clang-cl.exe on Windows
Change-Id: I1d723c9d3b5ca8a2bc6b27ef0189a7b053581398
Reviewed-on: https://gerrit.libreoffice.org/19928
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_GCC.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_class.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 8 | ||||
| -rw-r--r-- | solenv/gbuild/platform/linux.mk | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 9c81e34fef27..a0ff3109d285 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -25,7 +25,7 @@ gb_TMPDIR:=$(if $(TMPDIR),$(TMPDIR),/tmp) include $(GBUILDDIR)/platform/com_GCC_defs.mk include $(GBUILDDIR)/platform/windows.mk -ifeq ($(COM_GCC_IS_CLANG),) +ifeq ($(COM_IS_CLANG),) # This has to do something with calling conventions, which are different # for x86 and x64. Don't put it in the common part since it is breaking # and conde that uses boost::bind diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index d358b367f65b..917b1557dec7 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -152,7 +152,7 @@ endef # PrecompiledHeader class -ifeq ($(COM_GCC_IS_CLANG),TRUE) +ifeq ($(COM_IS_CLANG),TRUE) gb_PrecompiledHeader_get_enableflags = -include-pch $(call gb_PrecompiledHeader_get_target,$(1)) else gb_PrecompiledHeader_get_enableflags = -include $(notdir $(subst .gch,,$(call gb_PrecompiledHeader_get_target,$(1)))) \ diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 67af078bb7b3..3f7960550cef 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -93,7 +93,7 @@ gb_VISIBILITY_FLAGS := -DHAVE_GCC_VISIBILITY_FEATURE # If CC or CXX already include -fvisibility=hidden, don't duplicate it ifeq (,$(filter -fvisibility=hidden,$(CC))) gb__visibility_hidden := -fvisibility=hidden -ifeq ($(COM_GCC_IS_CLANG),TRUE) +ifeq ($(COM_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) gb__visibility_hidden := -fvisibility-ms-compat endif @@ -115,7 +115,7 @@ endif gb_CFLAGS_WERROR := $(if $(ENABLE_WERROR),-Werror) # This is the default in non-C++11 mode -ifeq ($(COM_GCC_IS_CLANG),TRUE) +ifeq ($(COM_IS_CLANG),TRUE) gb_CXX03FLAGS := -std=gnu++98 -Werror=c++11-extensions -Wno-c++11-long-long \ -Wno-deprecated-declarations else @@ -128,7 +128,7 @@ endif gb_CFLAGS_COMMON += -std=gnu89 ifeq ($(ENABLE_LTO),TRUE) -ifeq ($(COM_GCC_IS_CLANG),TRUE) +ifeq ($(COM_IS_CLANG),TRUE) gb_LTOFLAGS := -flto else gb_LTOFLAGS := -flto=$(PARALLELISM) -fuse-linker-plugin -O2 @@ -179,7 +179,7 @@ gb_LinkTarget_INCLUDE :=\ $(subst -I. , ,$(SOLARINC)) \ -I$(BUILDDIR)/config_$(gb_Side) \ -ifeq ($(COM_GCC_IS_CLANG),TRUE) +ifeq ($(COM_IS_CLANG),TRUE) ifeq ($(COMPILER_PLUGIN_TOOL),) gb_COMPILER_PLUGINS := -Xclang -load -Xclang $(BUILDDIR)/compilerplugins/obj/plugin.so -Xclang -add-plugin -Xclang loplugin ifneq ($(COMPILER_PLUGIN_WARNINGS_ONLY),) diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk index 284e70c79f5e..0b4ced4be997 100644 --- a/solenv/gbuild/platform/linux.mk +++ b/solenv/gbuild/platform/linux.mk @@ -8,7 +8,7 @@ # gb__LinkTarget_LDFLAGS_zdefs := -Wl,-z,defs -ifeq ($(COM_GCC_IS_CLANG),TRUE) +ifeq ($(COM_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) gb__LinkTarget_LDFLAGS_zdefs := endif |