Skip to content

Commit 74197de

Browse files
committed
Rollup merge of rust-lang#25792 - koobs:patch-1, r=alexcrichton
Currently, there are two conditional blocks that exist to check for "clang or gcc" On line 866: ``` if [ -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ] then err "either clang or gcc is required" fi ``` and on line 1019: ``` if [ -z "$CC" -a -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ] then err "either clang or gcc is required" fi ``` Given the order of the clauses, this results in the "either clang or gcc is required" error from the earlier block, (even) when CC is set. The expected behaviour is to honour user-flags, in this case CC. Aside from removing all hand-holdy compiler checks in favour of actual compiler *feature* checks, this change removes the redundant former block in favour of the latter block, which appears designed to allow the expected behaviour.
2 parents 09a3a59 + d323c14 commit 74197de

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

configure

-5
Original file line numberDiff line numberDiff line change
@@ -863,11 +863,6 @@ then
863863
CFG_DISABLE_JEMALLOC=1
864864
fi
865865

866-
if [ -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ]
867-
then
868-
err "either clang or gcc is required"
869-
fi
870-
871866
# OS X 10.9, gcc is actually clang. This can cause some confusion in the build
872867
# system, so if we find that gcc is clang, we should just use clang directly.
873868
if [ $CFG_OSTYPE = apple-darwin -a -z "$CFG_ENABLE_CLANG" ]

0 commit comments

Comments
 (0)