diff options
| author | John Koleszar <jkoleszar@google.com> | 2010-06-22 09:53:23 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2010-07-27 14:32:07 -0400 |
| commit | 23d68a5f3004960d1a50702e6d76323d5ea0a721 (patch) | |
| tree | 7b235cc74680a70992a0ddcefe987c7f3e97691c | |
| parent | aa82363c46fab1faf8e1e7b050eb5bedfc379176 (diff) | |
| download | libvpx-23d68a5f3004960d1a50702e6d76323d5ea0a721.tar libvpx-23d68a5f3004960d1a50702e6d76323d5ea0a721.tar.gz libvpx-23d68a5f3004960d1a50702e6d76323d5ea0a721.tar.bz2 libvpx-23d68a5f3004960d1a50702e6d76323d5ea0a721.zip | |
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
| -rwxr-xr-x | build/make/Makefile | 9 | ||||
| -rwxr-xr-x | configure | 1 |
2 files changed, 3 insertions, 7 deletions
diff --git a/build/make/Makefile b/build/make/Makefile index 20a48671e..5011ce36d 100755 --- 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 \ @@ -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 |