diff options
| author | dos-reis <gdr@axiomatics.org> | 2014-11-20 22:59:25 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2014-11-20 22:59:25 +0000 |
| commit | 851c7663fa7b705006c1a6d3ca45d4ded7e48024 (patch) | |
| tree | b2b763870794e1cdbfe471b49ab93fc99daf6662 /config | |
| parent | 8358dd22eb56a1b5e46e3d1e50295d53c4504165 (diff) | |
| download | open-axiom-851c7663fa7b705006c1a6d3ca45d4ded7e48024.tar.gz | |
Restore full build on Mac wby forcing Clang, the clearly preferred system compiler.
Diffstat (limited to 'config')
| -rw-r--r-- | config/open-axiom.m4 | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/config/open-axiom.m4 b/config/open-axiom.m4 index 676bf2bf..995ea70b 100644 --- a/config/open-axiom.m4 +++ b/config/open-axiom.m4 @@ -284,17 +284,31 @@ OPENAXIOM_LISP_FLAVOR OPENAXIOM_REJECT_ROTTED_LISP OPENAXIOM_HOST_LISP_CPU_PRECISION OPENAXIOM_CHECK_DELAYED_FFI +## Force Clang on Apple platforms; that is the only way we get +## anything sane going on on this fine platform. +case $host in + *apple*) + AC_PROG_CC([clang]) + AC_PROG_CXX([clang++]) + ;; + *) + AC_PROG_CC + AC_PROG_CXX([g++ clang++ icpc icc CC xlC c++]) + ;; +esac ## Where are the compilers coming from? GNU? Clang? oa_cxx_compiler_lineage=unknown -AC_PROG_CC -AC_PROG_CXX([g++ clang++ icpc icc CC xlC c++]) -if test x$GCC = xyes || test x$GXX = xyes; then - oa_cxx_compiler_lineage=gnu -else - case `$CXX -v` in - *clang*) oa_cxx_compiler_lineage=clang ;; - esac -fi +case `$CXX -v` in + *clang*) + oa_cxx_compiler_lineage=clang + ;; + *) + if test x$GCC = xyes || test x$GXX = xyes; then + oa_cxx_compiler_lineage=gnu + fi + ;; +esac + ## Augment C and C++ compiler flags with ABI directives as appropriate ## before we proceed to infer other host datatype properties. if test -n "$oa_host_lisp_precision"; then |