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 20a48671eaf67d35b437a25cdcac6d98f7448456..5011ce36dbcb84b59b8150af4baa3c72894cde77 100755 (executable)
--- a/build/make/Makefile
+++ b/build/make/Makefile
@@ -39,13 +39,8 @@ dist:
        @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 9be0624fb4dd4ac8405af9463555f50d3ab7bdb9..5c908d4b31a15d52e408121b2cf5489b463f5055 100755 (executable)
--- a/configure
+++ b/configure
@@ -385,6 +385,7 @@ VERSION_MAJOR=${VERSION_MAJOR}
 VERSION_MINOR=${VERSION_MINOR}
 VERSION_PATCH=${VERSION_PATCH}
 
+CONFIGURE_ARGS=${CONFIGURE_ARGS}
 EOF
     enabled child || echo "CONFIGURE_ARGS?=${CONFIGURE_ARGS}" >> config.mk