diff options
| author | Eduard Burtescu <edy.burt@gmail.com> | 2016-06-08 15:18:51 +0300 |
|---|---|---|
| committer | Eduard Burtescu <edy.burt@gmail.com> | 2016-08-02 09:01:47 +0300 |
| commit | 90ba77a7a9807a3a463f2820a4e652052e32efa0 (patch) | |
| tree | e414f40ab072239980555fc33a95ce12c8bad5eb | |
| parent | a9e291c3c681ebba49ab3516f9304a5b74626a3e (diff) | |
| download | rust-90ba77a7a9807a3a463f2820a4e652052e32efa0.tar.gz rust-90ba77a7a9807a3a463f2820a4e652052e32efa0.zip | |
Make --enable-orbit the default in ./configure.
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | mk/main.mk | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/configure b/configure index d4bd16167d3..29f16da0581 100755 --- a/configure +++ b/configure @@ -609,7 +609,7 @@ opt dist-host-only 0 "only install bins for the host architecture" opt inject-std-version 1 "inject the current compiler version of libstd into programs" opt llvm-version-check 1 "check if the LLVM version is supported, build anyway" opt rustbuild 0 "use the rust and cargo based build system" -opt orbit 0 "get MIR where it belongs - everywhere; most importantly, in orbit" +opt orbit 1 "get MIR where it belongs - everywhere; most importantly, in orbit" opt codegen-tests 1 "run the src/test/codegen tests" opt option-checking 1 "complain about unrecognized options in this configure script" opt ninja 0 "build LLVM using the Ninja generator (for MSVC, requires building in the correct environment)" @@ -733,7 +733,7 @@ if [ -n "$CFG_ENABLE_DEBUG_ASSERTIONS" ]; then putvar CFG_ENABLE_DEBUG_ASSERTION if [ -n "$CFG_ENABLE_DEBUGINFO" ]; then putvar CFG_ENABLE_DEBUGINFO; fi if [ -n "$CFG_ENABLE_DEBUG_JEMALLOC" ]; then putvar CFG_ENABLE_DEBUG_JEMALLOC; fi -if [ -n "$CFG_ENABLE_ORBIT" ]; then putvar CFG_ENABLE_ORBIT; fi +if [ -n "$CFG_DISABLE_ORBIT" ]; then putvar CFG_DISABLE_ORBIT; fi step_msg "looking for build programs" diff --git a/mk/main.mk b/mk/main.mk index fd12bf26dfc..9a3a59ded35 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -162,9 +162,9 @@ ifdef CFG_ENABLE_DEBUGINFO CFG_RUSTC_FLAGS += -g endif -ifdef CFG_ENABLE_ORBIT - $(info cfg: launching MIR (CFG_ENABLE_ORBIT)) - CFG_RUSTC_FLAGS += -Z orbit +ifdef CFG_DISABLE_ORBIT + $(info cfg: HOLD HOLD HOLD (CFG_DISABLE_ORBIT)) + CFG_RUSTC_FLAGS += -Z orbit=off endif ifdef SAVE_TEMPS |