Allow setting ICECC_VERSION in the autogen.input

Desktop / LibreOffice - Jan Holesovsky [collabora.com] - 7 February 2015 11:40 UTC

That way you can avoid having to set ICECC_VERSION in every shell where you want to use icecream with cross-compilation. See

http://holesovsky.blogspot.cz/2015/02/using-icecream-to-speed-up-libreoffice.html

for details.

###

diff --git a/config_host.mk.in b/config_host.mk.in
index e8d0ec4..1a28e63 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -268,6 +268,7 @@ export HUNSPELL_LIBS=$(gb_SPACE)@HUNSPELL_LIBS@
export HYPHEN_LIB=$(gb_SPACE)@HYPHEN_LIB@
export HYPH_SYSTEM_DIR=@HYPH_SYSTEM_DIR@
export ICECREAM_RUN=@ICECREAM_RUN@
+@x_ICECC_VERSION@ export ICECC_VERSION=@ICECC_VERSION@
export ICU_CFLAGS=$(gb_SPACE)@ICU_CFLAGS@
export ICU_LIBS=$(gb_SPACE)@ICU_LIBS@
export ICU_MAJOR=@ICU_MAJOR@
diff --git a/configure.ac b/configure.ac
index d8401fc..0e27a30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12637,6 +12637,17 @@ fi
AC_SUBST(ICECREAM_RUN)

dnl ===================================================================
+dnl Setup the ICECC_VERSION for the build the same way it was set for
+dnl configure, so that CC/CXX and ICECC_VERSION are in sync
+dnl ===================================================================
+x_ICECC_VERSION=[\#]
+if test -n "$ICECC_VERSION" ; then
+ x_ICECC_VERSION=
+fi
+AC_SUBST(x_ICECC_VERSION)
+AC_SUBST(ICECC_VERSION)
+
+dnl ===================================================================

AC_MSG_CHECKING([MPL subset])
MPL_SUBSET=

fbbd58d Allow setting ICECC_VERSION in the autogen.input.
config_host.mk.in | 1 +
configure.ac | 11 +++++++++++
2 files changed, 12 insertions(+)

Upstream: cgit.freedesktop.org

  • Share