liblangtag/ExternalProject_langtag.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
New commits: commit f9326a150a10f6bdc9509f7319d7af5079f29b46 Author: Fridrich Å trba <[email protected]> Date: Tue Nov 13 10:57:37 2012 +0100 Shortcircuit liblangtag's builtin detection using config.cache Change-Id: Ib53ab293d90b9b8a68d97b10d2ad020c69ab46f5 diff --git a/liblangtag/ExternalProject_langtag.mk b/liblangtag/ExternalProject_langtag.mk index e8f632d..98f64d8 100644 --- a/liblangtag/ExternalProject_langtag.mk +++ b/liblangtag/ExternalProject_langtag.mk @@ -22,7 +22,9 @@ $(call gb_ExternalProject_get_state_target,langtag,build): CC="$(CC) -MD -nologo \ $(if $(filter TRUE,$(ENABLE_DEBUG)),-Zi) \ $(SOLARINC)") \ - && ./configure --disable-modules --disable-test --disable-introspection \ + && echo \ + $(if $(filter TRUE,$(HAVE_GCC_BUILTIN_ATOMIC)),"lt_cv_has_atomic=yes","lt_cv_has_atomic=no") >> config.log \ + && ./configure -C --disable-modules --disable-test --disable-introspection \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter NO,$(SYSTEM_LIBXML)),LIBXML2_CFLAGS="-I$(OUTDIR)/inc/external" \ $(if $(filter MSC,$(COM)),LIBXML2_LIBS="$(OUTDIR)/lib/libxml2.lib",LIBXML2_LIBS="-L$(OUTDIR)/lib -lxml2"),\
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
