diff options
| author | Jan Djärv | 2013-12-28 11:12:43 +0100 |
|---|---|---|
| committer | Jan Djärv | 2013-12-28 11:12:43 +0100 |
| commit | 5f27a1b07d3e7e7e38087de96f3e2934e8ed207c (patch) | |
| tree | fe3c64d95a398f68427feedd2a4f02ee60b5e1bf | |
| parent | c62a19610996165c2d628154561f25e89ff05524 (diff) | |
| download | emacs-5f27a1b07d3e7e7e38087de96f3e2934e8ed207c.tar.gz emacs-5f27a1b07d3e7e7e38087de96f3e2934e8ed207c.zip | |
* configure.ac: Fix CC detection for xcrun case.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 9 |
2 files changed, 7 insertions, 6 deletions
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-12-28 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * configure.ac: Fix CC detection for xcrun case. | ||
| 4 | |||
| 1 | 2013-12-28 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2013-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 | ||
| 656 | dnl Sets GCC=yes if using gcc. | 656 | dnl Sets GCC=yes if using gcc. |
| 657 | AC_PROG_CC | ||
| 658 | if test -n "$XCRUN"; then | 657 | if 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 |
| 663 | else | ||
| 664 | AC_PROG_CC | ||
| 668 | fi | 665 | fi |
| 669 | AM_PROG_CC_C_O | 666 | AM_PROG_CC_C_O |
| 670 | 667 | ||