From 5f27a1b07d3e7e7e38087de96f3e2934e8ed207c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Sat, 28 Dec 2013 11:12:43 +0100 Subject: [PATCH] * configure.ac: Fix CC detection for xcrun case. --- ChangeLog | 4 ++++ configure.ac | 9 +++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4cc1cd042cf..ba555fc7169 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-12-28 Jan Djärv + + * configure.ac: Fix CC detection for xcrun case. + 2013-12-28 Paul Eggert Fix problem with MAKE and xcrun configuration. diff --git a/configure.ac b/configure.ac index 6c08c7c7308..5dafb51a5cf 100644 --- a/configure.ac +++ b/configure.ac @@ -654,17 +654,14 @@ fi #### Choose a compiler. dnl Sets GCC=yes if using gcc. -AC_PROG_CC if test -n "$XCRUN"; then if test -z "$CC"; then - if $XCRUN gcc --version >/dev/null 2>&1; then - CC="$XCRUN gcc" - elif $XCRUN clang --version >/dev/null 2>&1; then - CC="$XCRUN clang" - fi + AC_PROG_CC([gcc cc cl clang "$XCRUN gcc" "$XCRUN clang"]) fi AC_CHECK_PROGS(AR, [ar "$XCRUN ar"]) test -n "$AR" && export AR +else + AC_PROG_CC fi AM_PROG_CC_C_O -- 2.39.2