strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cross-compile: make sure configure fails if build-side configure fails

Browse source 
testing for existance of config_host.mk is flawed/doesn't catch all kind
of errors and thus gives false "OK" for incremental builds and not even for
builds after make clean
see also d691b46e52

Change-Id: I153f585c3a7870ef4a87848eccf7abd7d66987e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107970
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
This commit is contained in:
Christian Lohmaier 2020-12-18 16:23:59 +01:00
parent 4db61e4cb2
commit 315c7570c4
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure.ac
View file

@ -5226,7 +5226,9 @@ if test "$cross_compiling" = "yes"; then
$sub_conf_opts \
--srcdir=$srcdir \
2>&1 | sed -e 's/^/ /'
test -f ./config_host.mk 2>/dev/null || exit
if test [${PIPESTATUS[0]}] -ne 0; then
AC_MSG_ERROR([Running the configure script for BUILD side failed, see CONF-FOR-BUILD/config.log])
fi
# filter permitted build targets
PERMITTED_BUILD_TARGETS="
@ -5346,7 +5348,7 @@ if test "$cross_compiling" = "yes"; then
done
)
test -f CONF-FOR-BUILD/build-config || AC_MSG_ERROR([Running configure script for BUILD system failed, see CONF-FOR-BUILD/config.log])
test -f CONF-FOR-BUILD/build-config || AC_MSG_ERROR([setup/configure for BUILD side failed, see CONF-FOR-BUILD/config.log])
test -f config_build.mk || AC_MSG_ERROR([A file called config_build.mk was supposed to have been copied here, but it isn't found])
perl -pi -e 's,/(workdir|instdir)(/|$),/\1_for_build\2,g;' \
-e 's,/CONF-FOR-BUILD,,g;' config_build.mk