Skip to content

Commit 59b2a29

Browse files
committed
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.
1 parent 0f196bc commit 59b2a29

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

configure

-14
Original file line numberDiff line numberDiff line change
@@ -334,14 +334,6 @@ enable_if_not_disabled() {
334334
fi
335335
}
336336

337-
to_llvm_triple() {
338-
case $1 in
339-
i686-w64-mingw32) echo i686-pc-windows-gnu ;;
340-
x86_64-w64-mingw32) echo x86_64-pc-windows-gnu ;;
341-
*) echo $1 ;;
342-
esac
343-
}
344-
345337
to_gnu_triple() {
346338
case $1 in
347339
i686-pc-windows-gnu) echo i686-w64-mingw32 ;;
@@ -646,12 +638,6 @@ valopt_nosave host "${CFG_BUILD}" "GNUs ./configure syntax LLVM host triples"
646638
valopt_nosave target "${CFG_HOST}" "GNUs ./configure syntax LLVM target triples"
647639
valopt_nosave mandir "${CFG_PREFIX}/share/man" "install man pages in PATH"
648640

649-
# Temporarily support old triples until buildbots get updated
650-
CFG_BUILD=$(to_llvm_triple $CFG_BUILD)
651-
putvar CFG_BUILD # Yes, this creates a duplicate entry, but the last one wins.
652-
CFG_HOST=$(to_llvm_triple $CFG_HOST)
653-
CFG_TARGET=$(to_llvm_triple $CFG_TARGET)
654-
655641
# On Windows this determines root of the subtree for target libraries.
656642
# Host runtime libs always go to 'bin'.
657643
valopt libdir "${CFG_PREFIX}/lib" "install libraries"

0 commit comments

Comments
 (0)