configure: pass original arguments through to make dist
When running configure automatically through the make dist target,
reuse the arguments passed to the original configure command.
Change-Id: I40e5b8384d6485a565b91e6d2356d5bc9c4c5928
diff --git a/build/make/Makefile b/build/make/Makefile
index 20a4867..5011ce3 100755
--- a/build/make/Makefile
+++ b/build/make/Makefile
@@ -39,13 +39,8 @@
@if [ -d "$(DIST_DIR)/src" ]; then \
mkdir -p "$(DIST_DIR)/build"; \
cd "$(DIST_DIR)/build"; \
- if [ "$(TGT_CC)" = "rvct" ] ; then \
- echo "../src/configure --target=$(TOOLCHAIN) --libc=$(ALT_LIBC)"; \
- ../src/configure --target=$(TOOLCHAIN) --libc=$(ALT_LIBC); \
- else \
- echo "../src/configure --target=$(TOOLCHAIN)"; \
- ../src/configure --target=$(TOOLCHAIN); \
- fi; \
+ echo "Rerunning configure $(CONFIGURE_ARGS)"; \
+ ../src/configure $(CONFIGURE_ARGS); \
$(if $(filter vs%,$(TGT_CC)),make NO_LAUNCH_DEVENV=1;) \
fi
@if [ -d "$(DIST_DIR)" ]; then \
diff --git a/configure b/configure
index 9be0624..5c908d4 100755
--- a/configure
+++ b/configure
@@ -385,6 +385,7 @@
VERSION_MINOR=${VERSION_MINOR}
VERSION_PATCH=${VERSION_PATCH}
+CONFIGURE_ARGS=${CONFIGURE_ARGS}
EOF
enabled child || echo "CONFIGURE_ARGS?=${CONFIGURE_ARGS}" >> config.mk