aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Djärv2013-12-28 11:12:43 +0100
committerJan Djärv2013-12-28 11:12:43 +0100
commit5f27a1b07d3e7e7e38087de96f3e2934e8ed207c (patch)
treefe3c64d95a398f68427feedd2a4f02ee60b5e1bf
parentc62a19610996165c2d628154561f25e89ff05524 (diff)
downloademacs-5f27a1b07d3e7e7e38087de96f3e2934e8ed207c.tar.gz
emacs-5f27a1b07d3e7e7e38087de96f3e2934e8ed207c.zip
* configure.ac: Fix CC detection for xcrun case.
-rw-r--r--ChangeLog4
-rw-r--r--configure.ac9
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 @@
12013-12-28 Jan Djärv <jan.h.d@swipnet.se>
2
3 * configure.ac: Fix CC detection for xcrun case.
4
12013-12-28 Paul Eggert <eggert@cs.ucla.edu> 52013-12-28 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Fix problem with MAKE and xcrun configuration. 7 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
654#### Choose a compiler. 654#### Choose a compiler.
655 655
656dnl Sets GCC=yes if using gcc. 656dnl Sets GCC=yes if using gcc.
657AC_PROG_CC
658if test -n "$XCRUN"; then 657if test -n "$XCRUN"; then
659 if test -z "$CC"; then 658 if test -z "$CC"; then
660 if $XCRUN gcc --version >/dev/null 2>&1; then 659 AC_PROG_CC([gcc cc cl clang "$XCRUN gcc" "$XCRUN clang"])
661 CC="$XCRUN gcc"
662 elif $XCRUN clang --version >/dev/null 2>&1; then
663 CC="$XCRUN clang"
664 fi
665 fi 660 fi
666 AC_CHECK_PROGS(AR, [ar "$XCRUN ar"]) 661 AC_CHECK_PROGS(AR, [ar "$XCRUN ar"])
667 test -n "$AR" && export AR 662 test -n "$AR" && export AR
663else
664 AC_PROG_CC
668fi 665fi
669AM_PROG_CC_C_O 666AM_PROG_CC_C_O
670 667