trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iga...@apache.org
Subject git commit: TS-1872 More robust compiler detection
Date Fri, 03 May 2013 07:44:26 GMT
Updated Branches:
  refs/heads/master 634cb6622 -> c400c8848


TS-1872 More robust compiler detection

we add autoconf-archive's ax_compiler_vendor to more robustly detect
which compiler we're dealing with.

(For varying interpretations of robustness when dealing with autoconf)


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/c400c884
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/c400c884
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/c400c884

Branch: refs/heads/master
Commit: c400c88485c748b1d811d98336df668eb83169be
Parents: 634cb66
Author: Igor Galić <i.galic@brainsware.org>
Authored: Fri May 3 09:41:46 2013 +0200
Committer: Igor Galić <i.galic@brainsware.org>
Committed: Fri May 3 09:41:46 2013 +0200

----------------------------------------------------------------------
 build/ax_compiler_vendor.m4 |   84 ++++++++++++++++++++++++++++++++++++++
 configure.ac                |   16 ++++---
 2 files changed, 93 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c400c884/build/ax_compiler_vendor.m4
----------------------------------------------------------------------
diff --git a/build/ax_compiler_vendor.m4 b/build/ax_compiler_vendor.m4
new file mode 100644
index 0000000..73e32ea
--- /dev/null
+++ b/build/ax_compiler_vendor.m4
@@ -0,0 +1,84 @@
+# ===========================================================================
+#    http://www.gnu.org/software/autoconf-archive/ax_compiler_vendor.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_COMPILER_VENDOR
+#
+# DESCRIPTION
+#
+#   Determine the vendor of the C/C++ compiler, e.g., gnu, intel, ibm, sun,
+#   hp, borland, comeau, dec, cray, kai, lcc, metrowerks, sgi, microsoft,
+#   watcom, etc. The vendor is returned in the cache variable
+#   $ax_cv_c_compiler_vendor for C and $ax_cv_cxx_compiler_vendor for C++.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
+#   Copyright (c) 2008 Matteo Frigo
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 11
+
+AC_DEFUN([AX_COMPILER_VENDOR],
+[AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor,
+  [# note: don't check for gcc first since some other compilers define __GNUC__
+  vendors="intel:     __ICC,__ECC,__INTEL_COMPILER
+           ibm:       __xlc__,__xlC__,__IBMC__,__IBMCPP__
+           pathscale: __PATHCC__,__PATHSCALE__
+           clang:     __clang__
+           gnu:       __GNUC__
+           sun:       __SUNPRO_C,__SUNPRO_CC
+           hp:        __HP_cc,__HP_aCC
+           dec:       __DECC,__DECCXX,__DECC_VER,__DECCXX_VER
+           borland:   __BORLANDC__,__TURBOC__
+           comeau:    __COMO__
+           cray:      _CRAYC
+           kai:       __KCC
+           lcc:       __LCC__
+           sgi:       __sgi,sgi
+           microsoft: _MSC_VER
+           metrowerks: __MWERKS__
+           watcom:    __WATCOMC__
+           portland:  __PGI
+           unknown:   UNKNOWN"
+  for ventest in $vendors; do
+    case $ventest in
+      *:) vendor=$ventest; continue ;;
+      *)  vencpp="defined("`echo $ventest | sed 's/,/) || defined(/g'`")" ;;
+    esac
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[
+      #if !($vencpp)
+        thisisanerror;
+      #endif
+    ])], [break])
+  done
+  ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=`echo $vendor | cut -d: -f1`
+ ])
+])

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c400c884/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 911e053..fce8b72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -521,6 +521,8 @@ AC_PROG_CPP
 AC_PROG_CXXCPP
 AM_PROG_AS
 
+AX_COMPILER_VENDOR
+
 CFLAGS="${_ts_saved_CFLAGS}"
 CXXFLAGS="${_ts_saved_CXXFLAGS}"
 
@@ -697,12 +699,12 @@ AS_IF([test "x${has_optimizer_flags}" = "xno"],
 
 AM_CONDITIONAL([BUILD_HAVE_LIBCXX], [ false ])
 
-base_cc=`basename $CC`
+base_cc=$ax_cv_c_compiler_vendor
 
 case $host_os_def in
   linux)
     case $base_cc in
-    *icc*)
+    *intel*)
       # -Wall goes crazy, so turned these specific checks off for now:
       #
       #  111 is "statement is unrecahable"
@@ -730,7 +732,7 @@ case $host_os_def in
       release_opt="-g $common_opt $optimizing_flags -fno-strict-aliasing -Werror -Qunused-arguments"
       cxx_opt="-Wno-invalid-offsetof -Werror -Qunused-arguments"
       ;;
-    *) # gcc
+    *) # gnu
       # This is useful for finding odd conversions
       #    common_opt="-pipe -Wall -Werror -Wconversion -Wno-sign-conversion"
       ts_am_common_flags="-Wunused-parameter"
@@ -753,7 +755,7 @@ case $host_os_def in
       # clang on Darwin needs to use libc++ for any C++11 code.
       AM_CONDITIONAL([BUILD_HAVE_LIBCXX], [ true ])
       ;;
-    *) # gcc
+    *) # gnu
       common_opt="-pipe -Wall -Werror -Wno-deprecated-declarations"
       debug_opt="$common_opt"
       release_opt="-g $common_opt $optimizing_flags -feliminate-unused-debug-symbols -fno-strict-aliasing"
@@ -772,7 +774,7 @@ case $host_os_def in
       release_opt="-g $common_opt $optimizing_flags -feliminate-unused-debug-symbols -fno-strict-aliasing"
       cxx_opt="-Wno-invalid-offsetof -Qunused-arguments"
       ;;
-    *) # gcc
+    *) # gnu
       common_opt="-pipe -Wall -Werror"
       debug_opt="-ggdb3 $common_opt"
       release_opt="-g $common_opt $optimizing_flags -feliminate-unused-debug-symbols -fno-strict-aliasing"
@@ -782,7 +784,7 @@ case $host_os_def in
     TS_ADDTO(LDFLAGS, [-L/usr/local/lib])
     ;; # freebsd|kfreebsd)
   solaris)
-    if test "x${base_cc}" = "xcc"; then
+    if test "x${base_cc}" = "xsun"; then
       # TODO: If we no longer support SunStudio, should this code go away?
       common_opt="-mt -D__WORDSIZE=64" # FIXME: arch should be detected
       debug_opt="-g $common_opt"
@@ -796,7 +798,7 @@ case $host_os_def in
       if test "$solaris_use_stlport4" != yes; then
         postdeps_CXX="-library=Crun"
       fi
-    else # gcc
+    else # gnu
       common_opt="-pipe -Wall -Werror"
       debug_opt="-ggdb3 $common_opt"
       release_opt="-g $common_opt $optimizing_flags -feliminate-unused-debug-symbols -fno-strict-aliasing"


Mime
View raw message