about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2016-01-21 17:05:04 -0800
committerAlex Crichton <alex@alexcrichton.com>2016-02-11 11:12:33 -0800
commitbb2e92171fb95c911572ef58a6110c1c53fdd34c (patch)
treec6d7243945b7c3f083a250727f3301e1541180c6 /src/bootstrap
parent34f7364332c95b63a742709b96141142f6cfe3d8 (diff)
downloadrust-bb2e92171fb95c911572ef58a6110c1c53fdd34c.tar.gz
rust-bb2e92171fb95c911572ef58a6110c1c53fdd34c.zip
configure: Add an option to use the cargo build system
This commit adds a `--enable-rustbuild` option to the configure script which
will copy a different `Makefile.in` into place to intercept all `make`
invocations.

Currently this makefile only has one target, but it's expected to be filled out
quite a bit over time!
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/mk/Makefile.in23
1 files changed, 23 insertions, 0 deletions
diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
new file mode 100644
index 00000000000..1157346d774
--- /dev/null
+++ b/src/bootstrap/mk/Makefile.in
@@ -0,0 +1,23 @@
+# Copyright 20126 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# http://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
+
+include config.mk
+include $(CFG_SRC_DIR)mk/util.mk
+
+ifdef VERBOSE
+BOOTSTRAP_ARGS := -v
+else
+BOOTSTRAP_ARGS :=
+endif
+
+BOOTSTRAP := $(CFG_PYTHON) $(CFG_SRC_DIR)src/bootstrap/bootstrap.py $(BOOTSTRAP_ARGS)
+
+all:
+	$(Q)$(BOOTSTRAP)