diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-03-25 21:33:44 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-03-25 21:35:10 -0700 |
| commit | 00f7776daad5fc299d19346cdba21f22ab2fd79a (patch) | |
| tree | cbd5ef3fa1b05a226969486059845a2e5fe41a97 | |
| parent | d252539990f5b4abee412d08edc6b36fd2a6219e (diff) | |
| download | rust-00f7776daad5fc299d19346cdba21f22ab2fd79a.tar.gz rust-00f7776daad5fc299d19346cdba21f22ab2fd79a.zip | |
mk: Make nightlyism a configure option
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | mk/main.mk | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/configure b/configure index e875a9a0923..b2b861a019a 100755 --- a/configure +++ b/configure @@ -383,6 +383,7 @@ opt local-rust 0 "use an installed rustc rather than downloading a snapshot" opt pax-flags 0 "apply PaX flags to rustc binaries (required for GRSecurity/PaX-patched kernels)" opt inject-std-version 1 "inject the current compiler version of libstd into programs" opt rpath 1 "build rpaths into rustc itself" +opt nightly 0 "build nightly packages" valopt prefix "/usr/local" "set installation prefix" valopt local-rust-root "/usr/local" "set prefix for local rust binary" valopt llvm-root "" "set LLVM root" diff --git a/mk/main.mk b/mk/main.mk index 38943f1f773..f59a553d783 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -16,7 +16,7 @@ CFG_RELEASE_NUM=0.10 CFG_RELEASE_LABEL=-pre -ifndef CFG_NIGHTLY +ifndef CFG_ENABLE_NIGHTLY # This is the normal version string CFG_RELEASE=$(CFG_RELEASE_NUM)$(CFG_RELEASE_LABEL) CFG_PACKAGE_VERS=$(CFG_RELEASE) |