summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-07-20 12:02:31 +0200
committerStephan Bergmann <sbergman@redhat.com>2020-07-20 17:43:58 +0200
commit0f2eba50991e198fe5923a01741389f6dcc1d63c (patch)
tree553db9b55947fb05e0ebe14387a3ca6eb24a4912 /external
parentfed392061613f71ecd04a485a8ec0de0595b441c (diff)
external/libffi configure needs MAKE
It failed for me on Windows with > config.status: error: in `/cygdrive/c/lo/core/workdir/UnpackedTarball/libffi/x86_64-pc-cygwin': > config.status: error: Something went wrong bootstrapping makefile fragments > for automatic dependency tracking. Try re-running configure with the > '--disable-dependency-tracking' option to at least be able to build > the package (albeit without support for automatic dependency tracking). > See `config.log' for more details > make[1]: *** [C:/lo/core/external/libffi/ExternalProject_libffi.mk:28: C:/lo/core/workdir/ExternalProject/libffi/build] Error 1 because it didn't find any `make` (I only have an /opt/lo/bin/make installed). Change-Id: Id3e119bbe37df446571a6ef293b8fae8e5b36fde Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99034 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
-rw-r--r--external/libffi/ExternalProject_libffi.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/external/libffi/ExternalProject_libffi.mk b/external/libffi/ExternalProject_libffi.mk
index 49bd1af15d0c..c9c89828768c 100644
--- a/external/libffi/ExternalProject_libffi.mk
+++ b/external/libffi/ExternalProject_libffi.mk
@@ -27,7 +27,7 @@ $(call gb_ExternalProject_get_state_target,libffi,build):
$(call gb_Trace_StartRange,libffi,EXTERNAL)
$(call gb_ExternalProject_run,build,\
export LIB="$(ILIB)" && \
- ./configure \
+ MAKE=$(MAKE) ./configure \
--enable-option-checking=fatal \
--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \
$(if $(filter LINUX,$(OS)), \