diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2022-12-16 18:41:13 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2022-12-21 15:17:49 +0000 |
| commit | d9617d5529e0da23bd8602d07ce459cc42746e02 (patch) | |
| tree | b5167194b8511b40e977edbddab7566fa816b2f9 /bin | |
| parent | cd274347896dc88bb137ef8cae87a86d9b977aef (diff) | |
keep environment clear of SYSTEM_FOO vars
those are only meant to be used by the build system (primarily
RepositoryExternal.mk) - of course no rule without exception:
concat-deps reads SYSTEM_BOOST from env, so set it in the corresponding
recipe lines
this cherry-pick also includes the follow-up fix from
https://gerrit.libreoffice.org/c/core/+/144586
make inclusion of config_host.mk unconditional
Change-Id: I83c88fc6ad4467b429771c43650fe7fc0ccde407
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144343
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
(cherry picked from commit b688b779ba20a4bec653808a42fe88cfac851029)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144682
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/get_config_variables | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/get_config_variables b/bin/get_config_variables index aa8198a44f4f..7cc1e9325db4 100644 --- a/bin/get_config_variables +++ b/bin/get_config_variables @@ -18,7 +18,7 @@ test -n "$SED" && glv_sed="$SED" || glv_sed=$(command -v sed) while [ -n "$1" ] ; do glv_var="$1" shift - glv_value=$("${glv_grep}" "^ *export ${glv_var}=" ${glv_config} | "${glv_sed}" -e 's/[^=]*=//') + glv_value=$("${glv_grep}" "^ *\(export *\)\?${glv_var}=" ${glv_config} | "${glv_sed}" -e 's/[^=]*=//') export ${glv_var}="${glv_value}" done |