aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraydon Hoare <[email protected]>2011-03-25 10:29:45 -0700
committerGraydon Hoare <[email protected]>2011-03-25 10:29:45 -0700
commit10f336055cb13518690f8d280240d30e3f13e508 (patch)
tree1afd5ad8477dbc556093a4e3059a756ce245a62a
parentFix typo in Ref.Task.Comm (diff)
downloadrust-10f336055cb13518690f8d280240d30e3f13e508.tar.xz
rust-10f336055cb13518690f8d280240d30e3f13e508.zip
Auto-reconfigure on Makefile.in or configure change.
-rw-r--r--Makefile.in10
-rwxr-xr-xconfigure3
2 files changed, 13 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in
index d94da8dc..e2cf9f34 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1106,6 +1106,16 @@ endif
depend: boot/rustboot$(X) $(CRATE_DEPFILES) $(ML_DEPFILES) $(C_DEPFILES)
+
+######################################################################
+# Re-configuration
+######################################################################
+
+config.mk: $(S)configure $(S)Makefile.in
+ @$(call E, cfg: reconfiguring)
+ $(S)configure $(CFG_CONFIGURE_ARGS)
+
+
######################################################################
# Distribution
######################################################################
diff --git a/configure b/configure
index 529ad8ad..573ffe91 100755
--- a/configure
+++ b/configure
@@ -87,6 +87,8 @@ CFG_CPUTYPE=$(uname -m)
CFG_SELF=$(echo $0 | tr '\' '/')
CFG_SRC_DIR=${CFG_SELF%${CFG_SELF##*/}}
CFG_BUILD_DIR=$(echo $PWD | tr '\' '/')
+CFG_CONFIGURE_ARGS="$@"
+
msg "recreating config.mk"
echo '' >config.mk
@@ -108,6 +110,7 @@ putvar CFG_SRC_DIR
putvar CFG_BUILD_DIR
putvar CFG_OSTYPE
putvar CFG_CPUTYPE
+putvar CFG_CONFIGURE_ARGS
msg "looking for build programs"
probe_need CFG_GCC gcc