Autoconf: allow for versioned GCC compilers (necessary for MacPorts).

SNSerHello · Oct 24, 2011 · 7fe1756 · 7fe1756
1 parent 751018c
commit 7fe1756
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/config/choose-backend-compiler.m4 b/config/choose-backend-compiler.m4
@@ -196,7 +196,7 @@ dnl build using ROSE)
 # DQ (1/15/2007): This does not work, it seems that BACKEND_C_COMPILER must be a simple name not a compound name using an option!
 # Specify any option that specific backend compiler require (e.g. -restrict)
  case $COMPILER_NAME in
- gcc|g++)
+ gcc*|g++*)
  ;;
  icc|icpc)
  # BACKEND_C_COMPILER="$BACKEND_C_COMPILER -restrict"

diff --git a/config/compiler-defs.m4 b/config/compiler-defs.m4
@@ -28,7 +28,7 @@ dnl predefined by a specific compiler
  # g++|gcc|mpicc|mpic++|mpicxx|mpiCC)
  # TOO (2/16/2011): added support for tensilica compilers, assuming they are
  # like GCC (they use a GCC front-end)
- g++|gcc|mpicc|mpic++|mpicxx|mpiCC|xt-xc++|xt-xcc)
+ g++*|gcc*|mpicc|mpic++|mpicxx|mpiCC|xt-xc++|xt-xcc)
  BACKEND_GCC_MAJOR=`echo|$BACKEND_CXX_COMPILER -dumpversion | cut -d\. -f1`
  BACKEND_GCC_MINOR=`echo|$BACKEND_CXX_COMPILER -dumpversion | cut -d\. -f2`
  BACKEND_GCC_PATCHLEVEL=`echo|$BACKEND_CXX_COMPILER -dumpversion | cut -d\. -f3`

diff --git a/config/create_system_headers b/config/create_system_headers
@@ -198,8 +198,8 @@ fi
  # Support for compiling ROSE with GNU g++ compiler
  # g++|gcc|icpc|icc|mpicc|mpic++|mpiCC|mpicxx|roseTranslator)
  # g++|gcc|icpc|icc|mpicc|mpic++|mpiCC|mpicxx|c++)
- g++|gcc|icpc|icc|mpicc|mpic++|mpiCC|mpicxx|c++|xt-xcc|xt-xc++)
- if [ "$compilerName" = "gcc" -o "$compilerName" = "icc" -o "$compilerName" = "mpicc" -o "$compilerName" = "xt-xcc" ]
+ g++*|gcc*|icpc|icc|mpicc|mpic++|mpiCC|mpicxx|c++|xt-xcc|xt-xc++)
+ if [[ "$compilerName" = gcc* || "$compilerName" = "icc" || "$compilerName" = "mpicc" || "$compilerName" = "xt-xcc" ]]
  then
  is_C_compiler="yes"
  language="c"

diff --git a/config/get_compiler_header_dirs b/config/get_compiler_header_dirs
@@ -9,7 +9,7 @@ compilerName="`basename $1`"
 
  case "$compilerName" in
  # Support for compiling ROSE with GNU g++ compiler
- g++|gcc|icpc|icc|mpicc|mpic++|mpiCC|mpicxx|c++|xt-xcc|xt-xc++)
+ g++*|gcc*|icpc|icc|mpicc|mpic++|mpiCC|mpicxx|c++|xt-xcc|xt-xc++)
  if [ "$compilerName" = "gcc" -o "$compilerName" = "icc" -o "$compilerName" = "mpicc" -o "$compilerName" = "xt-xcc" ]
  then
  language="c"