makefile: fix addition of --disable-lib

When potentially adding the `--disable-lib` flag, don't drop existing
extra configure flags. Specifically, the `--enable-crossany` flag
from distro-build could get lost, which breaks a soutrce distribution
with built packages.
This commit is contained in:
Matthew Flatt 2020-05-03 09:40:36 -06:00
parent 9465cbd7e6
commit 17a5711dbb

View File

@ -853,7 +853,7 @@ BUNDLE_FROM_SERVER_TARGET = bundle-from-server
client: client:
if [ ! -d build/log ] ; then rm -rf build/user ; fi if [ ! -d build/log ] ; then rm -rf build/user ; fi
$(MAKE) $(CLIENT_BASE) $(COPY_ARGS) MORE_CONFIGURE_ARGS="$(DISABLE_STATIC_LIBS)" $(MAKE) $(CLIENT_BASE) $(COPY_ARGS) MORE_CONFIGURE_ARGS="$(MORE_CONFIGURE_ARGS) $(DISABLE_STATIC_LIBS)"
$(MAKE) distro-build-from-server $(COPY_ARGS) $(MAKE) distro-build-from-server $(COPY_ARGS)
$(MAKE) $(BUNDLE_FROM_SERVER_TARGET) $(COPY_ARGS) $(MAKE) $(BUNDLE_FROM_SERVER_TARGET) $(COPY_ARGS)
$(USER_RACKET) -l distro-build/set-config $(SET_BUNDLE_CONFIG_q) $(USER_RACKET) -l distro-build/set-config $(SET_BUNDLE_CONFIG_q)