external/liblangtag/ExternalProject_liblangtag.mk | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
New commits:
commit c6e2a64f2dc20ff81bdd4dc4c2e66f62f0343484
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Wed Aug 2 16:05:26 2023 +0200
Commit: Balazs Varga <balazs.varga.ext...@allotropia.de>
CommitDate: Wed Oct 2 19:22:22 2024 +0200
REAL_CC[_CFLAGS] are already set by gb_ExternalProject_run
(and that also takes care of proper quoting)
Change-Id: Ic8c29300a2e6d5381c0d8873572f7c076362c93d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166324
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174226
Reviewed-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
Tested-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
diff --git a/external/liblangtag/ExternalProject_liblangtag.mk
b/external/liblangtag/ExternalProject_liblangtag.mk
index 1ce4b6eb7367..0f005e27b355 100644
--- a/external/liblangtag/ExternalProject_liblangtag.mk
+++ b/external/liblangtag/ExternalProject_liblangtag.mk
@@ -17,9 +17,6 @@ $(eval $(call gb_ExternalProject_register_targets,liblangtag,\
build \
))
-# disable ccache on windows, as it doesn't cope with the quoted defines
-# liblangtag uses (-DBUILDDIR="\"$(abs_top_builddir)\"" and similar).
-# Results in "cl : Command line error D8003 : missing source filename"
$(call gb_ExternalProject_get_state_target,liblangtag,build):
$(call gb_Trace_StartRange,liblangtrag,EXTERNAL)
$(call gb_ExternalProject_run,build,\
@@ -39,10 +36,7 @@ $(call gb_ExternalProject_get_state_target,liblangtag,build):
$(if $(filter
MACOSX,$(OS)),--prefix=/@.__________________________________________________URELIB)
\
$(if $(filter-out LINUX
FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin
-Wl$(COMMA)-rpath,\"\$$\$$ORIGIN) \
$(if $(filter-out
SOLARIS,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin
-Wl$(COMMA)-R$(COMMA)\"\$$\$$ORIGIN) \
- && $(if $(filter WNT,$(OS)),\
- REAL_CC="$(shell cygpath -w $(lastword $(filter-out
-%,$(CC))))" \
- REAL_CC_FLAGS="$(filter -%,$(CC))") \
- $(if $(verbose),V=1) \
+ && $(if $(verbose),V=1) \
$(MAKE) \
LIBO_TUNNEL_LIBRARY_PATH='$(subst ','\'',$(subst
$$,$$$$,$(call gb_Helper_extend_ld_path,$(call
gb_UnpackedTarball_get_dir,liblangtag)/liblangtag/.libs)))' \
$(if $(filter MACOSX,$(OS)),\
