odk/settings/settings.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9b072ee21a31127b008323749fe343f406da0fe4
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Mon May 27 12:16:06 2024 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Tue May 28 14:10:29 2024 +0200
odk: don't run compiler -dumpversion for eaach include of settings.mk
VAR=$(shell … ) will run the shell command each time the line is parsed,
i.e. for each include of the settings.mk from the examples. Use
simple/one-time expansion using := avoids that.
Change-Id: I46e6c486fbbe03bba37436d4ca98ddd0b6562ad3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168091
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 13289c96db6e..a479dd702fae 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -319,7 +319,7 @@ SHAREDLIB_EXT=so
SHAREDLIB_PRE=lib
SHAREDLIB_OUT=$(OUT_LIB)
-GCC_VERSION=$(shell $(CC) -dumpversion)
+GCC_VERSION:=$(shell $(CC) -dumpversion)
COMID=gcc3
CPPU_ENV=gcc3
@@ -530,7 +530,7 @@ SHAREDLIB_EXT=so
SHAREDLIB_PRE=lib
SHAREDLIB_OUT=$(OUT_LIB)
-GCC_VERSION=$(shell $(CC) -dumpversion)
+GCC_VERSION:=$(shell $(CC) -dumpversion)
COMID=gcc3
CPPU_ENV=gcc3
