diff options
| author | Brian Anderson <banderson@mozilla.com> | 2016-01-29 15:55:11 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2016-01-29 15:55:11 -0800 |
| commit | 59b2a29e8e18e9a7ad8211ffdffcae66cc621bd1 (patch) | |
| tree | 3a4da3969aeebfea4408182cbbc6da463a6adce9 | |
| parent | 0f196bcc3b23925854e3d758c03f56c7520e9b99 (diff) | |
| download | rust-59b2a29e8e18e9a7ad8211ffdffcae66cc621bd1.tar.gz rust-59b2a29e8e18e9a7ad8211ffdffcae66cc621bd1.zip | |
configure: Remove compatibility hacks for windows triples
Buildbot was updated long ago to use the correct triples. The putvar here is emitting garbage into `configure --help` so I want it gone.
| -rwxr-xr-x | configure | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/configure b/configure index 2693e9bcd23..572e486f816 100755 --- a/configure +++ b/configure @@ -334,14 +334,6 @@ enable_if_not_disabled() { fi } -to_llvm_triple() { - case $1 in - i686-w64-mingw32) echo i686-pc-windows-gnu ;; - x86_64-w64-mingw32) echo x86_64-pc-windows-gnu ;; - *) echo $1 ;; - esac -} - to_gnu_triple() { case $1 in i686-pc-windows-gnu) echo i686-w64-mingw32 ;; @@ -646,12 +638,6 @@ valopt_nosave host "${CFG_BUILD}" "GNUs ./configure syntax LLVM host triples" valopt_nosave target "${CFG_HOST}" "GNUs ./configure syntax LLVM target triples" valopt_nosave mandir "${CFG_PREFIX}/share/man" "install man pages in PATH" -# Temporarily support old triples until buildbots get updated -CFG_BUILD=$(to_llvm_triple $CFG_BUILD) -putvar CFG_BUILD # Yes, this creates a duplicate entry, but the last one wins. -CFG_HOST=$(to_llvm_triple $CFG_HOST) -CFG_TARGET=$(to_llvm_triple $CFG_TARGET) - # On Windows this determines root of the subtree for target libraries. # Host runtime libs always go to 'bin'. valopt libdir "${CFG_PREFIX}/lib" "install libraries" |
