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 /external | |
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 'external')
-rw-r--r-- | external/cairo/UnpackedTarball_cairo.mk | 2 | ||||
-rw-r--r-- | external/graphite/StaticLibrary_graphite.mk | 2 | ||||
-rw-r--r-- | external/libabw/UnpackedTarball_libabw.mk | 2 | ||||
-rw-r--r-- | external/libcdr/UnpackedTarball_libcdr.mk | 2 | ||||
-rw-r--r-- | external/libcmis/StaticLibrary_cmis.mk | 2 | ||||
-rw-r--r-- | external/libebook/UnpackedTarball_libebook.mk | 2 | ||||
-rw-r--r-- | external/libetonyek/UnpackedTarball_libetonyek.mk | 2 | ||||
-rw-r--r-- | external/libexttextcat/ExternalProject_exttextcat.mk | 2 | ||||
-rw-r--r-- | external/libfreehand/UnpackedTarball_libfreehand.mk | 2 | ||||
-rw-r--r-- | external/libmspub/UnpackedTarball_libmspub.mk | 2 | ||||
-rw-r--r-- | external/libmwaw/UnpackedTarball_libmwaw.mk | 2 | ||||
-rw-r--r-- | external/libodfgen/UnpackedTarball_libodfgen.mk | 2 | ||||
-rw-r--r-- | external/libpagemaker/UnpackedTarball_libpagemaker.mk | 2 | ||||
-rw-r--r-- | external/librevenge/UnpackedTarball_librevenge.mk | 2 | ||||
-rw-r--r-- | external/libvisio/UnpackedTarball_libvisio.mk | 2 | ||||
-rw-r--r-- | external/libwps/UnpackedTarball_libwps.mk | 2 | ||||
-rw-r--r-- | external/nss/UnpackedTarball_nss.mk | 2 |
17 files changed, 17 insertions, 17 deletions
diff --git a/external/cairo/UnpackedTarball_cairo.mk b/external/cairo/UnpackedTarball_cairo.mk index 35c8357c5edb..ce061a11fa8b 100644 --- a/external/cairo/UnpackedTarball_cairo.mk +++ b/external/cairo/UnpackedTarball_cairo.mk @@ -41,7 +41,7 @@ ifneq (,$(filter ANDROID IOS,$(OS))) $(eval $(call gb_UnpackedTarball_add_file,cairo,.,external/cairo/cairo/dummy_pkg_config)) endif -ifeq ($(COM_GCC_IS_CLANG),TRUE) +ifeq ($(COM_IS_CLANG),TRUE) $(eval $(call gb_UnpackedTarball_add_patches,cairo,\ external/cairo/cairo/no-flto-clang.patch \ )) diff --git a/external/graphite/StaticLibrary_graphite.mk b/external/graphite/StaticLibrary_graphite.mk index ddbf9955e6d7..4f645666197d 100644 --- a/external/graphite/StaticLibrary_graphite.mk +++ b/external/graphite/StaticLibrary_graphite.mk @@ -24,7 +24,7 @@ $(eval $(call gb_StaticLibrary_add_defs,graphite,\ )) ifeq ($(COM),GCC) -ifneq ($(COM_GCC_IS_CLANG),TRUE) +ifneq ($(COM_IS_CLANG),TRUE) $(eval $(call gb_StaticLibrary_add_cxxflags,graphite,\ -fpermissive \ )) diff --git a/external/libabw/UnpackedTarball_libabw.mk b/external/libabw/UnpackedTarball_libabw.mk index eb6b75cf470b..b0d1610671c7 100644 --- a/external/libabw/UnpackedTarball_libabw.mk +++ b/external/libabw/UnpackedTarball_libabw.mk @@ -13,7 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libabw,$(ABW_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,libabw,0)) -ifeq ($(COM_GCC_IS_CLANG),TRUE) +ifeq ($(COM_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) $(eval $(call gb_UnpackedTarball_add_patches,libabw, \ external/libabw/ubsan-visibility.patch \ diff --git a/external/libcdr/UnpackedTarball_libcdr.mk b/external/libcdr/UnpackedTarball_libcdr.mk index f43bd1b53dfd..e3c218386f50 100644 --- a/external/libcdr/UnpackedTarball_libcdr.mk +++ b/external/libcdr/UnpackedTarball_libcdr.mk @@ -13,7 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libcdr,$(CDR_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,libcdr,0)) -ifeq ($(COM_GCC_IS_CLANG),TRUE) +ifeq ($(COM_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) $(eval $(call gb_UnpackedTarball_add_patches,libcdr, \ external/libcdr/ubsan-visibility.patch \ diff --git a/external/libcmis/StaticLibrary_cmis.mk b/external/libcmis/StaticLibrary_cmis.mk index 76c0866c289c..eb5b4f5d581d 100644 --- a/external/libcmis/StaticLibrary_cmis.mk +++ b/external/libcmis/StaticLibrary_cmis.mk @@ -11,7 +11,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,cmislib)) $(eval $(call gb_StaticLibrary_set_warnings_not_errors,cmislib)) -ifeq ($(COM_GCC_IS_CLANG),TRUE) +ifeq ($(COM_IS_CLANG),TRUE) # Avoid narrowing conversion error (even though the option is technically a warning) # caused by boost. $(eval $(call gb_StaticLibrary_add_cxxflags,cmislib,\ diff --git a/external/libebook/UnpackedTarball_libebook.mk b/external/libebook/UnpackedTarball_libebook.mk index 4d8622efa8a7..094d4e93839c 100644 --- a/external/libebook/UnpackedTarball_libebook.mk +++ b/external/libebook/UnpackedTarball_libebook.mk @@ -18,7 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libebook, \ external/libebook/0001-lrf-compute-color-interpolation-coeff.-correctly.patch.1 \ )) -ifeq ($(COM_GCC_IS_CLANG),TRUE) +ifeq ($(COM_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) $(eval $(call gb_UnpackedTarball_add_patches,libebook, \ external/libebook/ubsan-visibility.patch \ diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk index 7f0d653d9b7c..88cfda31629a 100644 --- a/external/libetonyek/UnpackedTarball_libetonyek.mk +++ b/external/libetonyek/UnpackedTarball_libetonyek.mk @@ -30,7 +30,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\ endif endif -ifeq ($(COM_GCC_IS_CLANG),TRUE) +ifeq ($(COM_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) $(eval $(call gb_UnpackedTarball_add_patches,libetonyek, \ external/libetonyek/ubsan-visibility.patch \ diff --git a/external/libexttextcat/ExternalProject_exttextcat.mk b/external/libexttextcat/ExternalProject_exttextcat.mk index fdad93b77677..262af0b22df3 100644 --- a/external/libexttextcat/ExternalProject_exttextcat.mk +++ b/external/libexttextcat/ExternalProject_exttextcat.mk @@ -18,7 +18,7 @@ $(call gb_ExternalProject_get_state_target,exttextcat,build): ./configure --disable-shared --with-pic \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ CFLAGS="$(CFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_DEBUG_CFLAGS) $(gb_COMPILEROPTFLAGS) \ - $(if $(COM_GCC_IS_CLANG),-Qunused-arguments) \ + $(if $(COM_IS_CLANG),-Qunused-arguments) \ $(if $(filter AIX,$(OS)),-D_LINUX_SOURCE_COMPAT)" \ && $(MAKE) \ ) diff --git a/external/libfreehand/UnpackedTarball_libfreehand.mk b/external/libfreehand/UnpackedTarball_libfreehand.mk index c1abfa38a519..7394b98fe8ae 100644 --- a/external/libfreehand/UnpackedTarball_libfreehand.mk +++ b/external/libfreehand/UnpackedTarball_libfreehand.mk @@ -18,7 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libfreehand,\ external/libfreehand/replace_transform_class_with_struct.patch \ )) -ifeq ($(COM_GCC_IS_CLANG),TRUE) +ifeq ($(COM_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) $(eval $(call gb_UnpackedTarball_add_patches,libfreehand, \ external/libfreehand/ubsan-visibility.patch \ diff --git a/external/libmspub/UnpackedTarball_libmspub.mk b/external/libmspub/UnpackedTarball_libmspub.mk index a8c673c877f3..57845333cb4e 100644 --- a/external/libmspub/UnpackedTarball_libmspub.mk +++ b/external/libmspub/UnpackedTarball_libmspub.mk @@ -17,7 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmspub,\ external/libmspub/ubsan.patch \ )) -ifeq ($(COM_GCC_IS_CLANG),TRUE) +ifeq ($(COM_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) $(eval $(call gb_UnpackedTarball_add_patches,libmspub, \ external/libmspub/ubsan-visibility.patch \ diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk index 823fab2f04a3..072da50ed5f6 100644 --- a/external/libmwaw/UnpackedTarball_libmwaw.mk +++ b/external/libmwaw/UnpackedTarball_libmwaw.mk @@ -13,7 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libmwaw,$(MWAW_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,libmwaw,0)) -ifeq ($(COM_GCC_IS_CLANG),TRUE) +ifeq ($(COM_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \ external/libmwaw/ubsan-visibility.patch \ diff --git a/external/libodfgen/UnpackedTarball_libodfgen.mk b/external/libodfgen/UnpackedTarball_libodfgen.mk index 1c002c8aa9e7..3cbeb5502d08 100644 --- a/external/libodfgen/UnpackedTarball_libodfgen.mk +++ b/external/libodfgen/UnpackedTarball_libodfgen.mk @@ -13,7 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libodfgen,$(ODFGEN_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,libodfgen,0)) -ifeq ($(COM_GCC_IS_CLANG),TRUE) +ifeq ($(COM_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) $(eval $(call gb_UnpackedTarball_add_patches,libodfgen, \ external/libodfgen/ubsan-visibility.patch \ diff --git a/external/libpagemaker/UnpackedTarball_libpagemaker.mk b/external/libpagemaker/UnpackedTarball_libpagemaker.mk index 6322c2e7091a..ad857107698e 100644 --- a/external/libpagemaker/UnpackedTarball_libpagemaker.mk +++ b/external/libpagemaker/UnpackedTarball_libpagemaker.mk @@ -13,7 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libpagemaker,$(PAGEMAKER_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,libpagemaker,0)) -ifeq ($(COM_GCC_IS_CLANG),TRUE) +ifeq ($(COM_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) $(eval $(call gb_UnpackedTarball_add_patches,libpagemaker, \ external/libpagemaker/ubsan-visibility.patch \ diff --git a/external/librevenge/UnpackedTarball_librevenge.mk b/external/librevenge/UnpackedTarball_librevenge.mk index 192faf4a5044..d44678469389 100644 --- a/external/librevenge/UnpackedTarball_librevenge.mk +++ b/external/librevenge/UnpackedTarball_librevenge.mk @@ -13,7 +13,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,librevenge,$(REVENGE_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,librevenge,0)) -ifeq ($(COM_GCC_IS_CLANG),TRUE) +ifeq ($(COM_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) $(eval $(call gb_UnpackedTarball_add_patches,librevenge, \ external/librevenge/ubsan-visibility.patch \ diff --git a/external/libvisio/UnpackedTarball_libvisio.mk b/external/libvisio/UnpackedTarball_libvisio.mk index 9b555d4706ef..027c38e5b755 100644 --- a/external/libvisio/UnpackedTarball_libvisio.mk +++ b/external/libvisio/UnpackedTarball_libvisio.mk @@ -17,7 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libvisio,\ external/libvisio/ubsan.patch \ )) -ifeq ($(COM_GCC_IS_CLANG),TRUE) +ifeq ($(COM_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) $(eval $(call gb_UnpackedTarball_add_patches,libvisio, \ external/libvisio/ubsan-visibility.patch \ diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk index 5fad6b6ba620..754bd59a09c5 100644 --- a/external/libwps/UnpackedTarball_libwps.mk +++ b/external/libwps/UnpackedTarball_libwps.mk @@ -26,7 +26,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwps,\ endif endif -ifeq ($(COM_GCC_IS_CLANG),TRUE) +ifeq ($(COM_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) $(eval $(call gb_UnpackedTarball_add_patches,libwps, \ external/libwps/ubsan-visibility.patch.0 \ diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index d297ee4b1e45..4afd2751fdc3 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -36,7 +36,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ )) endif -ifeq ($(COM_GCC_IS_CLANG),TRUE) +ifeq ($(COM_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/asan.patch.1 \ |