Skip to content
Extraits de code Groupes Projets
Valider a6285efd rédigé par Joe Truba's avatar Joe Truba Validation de Tom Barbette
Parcourir les fichiers

clang: avoid cross-compile tool selection when using clang

When compiling with clang, if CC/CXX are overwritten then we're no
longer compiling with clang.

Merge https://github.com/kohler/click/pull/374
parent 12c0fc58
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -4024,7 +4024,9 @@ test -n "$target_alias" && ...@@ -4024,7 +4024,9 @@ test -n "$target_alias" &&
NONENONEs,x,x, && NONENONEs,x,x, &&
program_prefix=${target_alias}- program_prefix=${target_alias}-
   
if test -n "$ac_tool_prefix"; then using_clang=`$CXX --version | grep ^clang | cut -f1 -d' '`
if test -z "$using_clang"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2 set dummy ${ac_tool_prefix}gcc; ac_word=$2
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
...@@ -4126,7 +4128,7 @@ else ...@@ -4126,7 +4128,7 @@ else
CC="$ac_cv_prog_CC" CC="$ac_cv_prog_CC"
fi fi
   
if test -n "$ac_tool_prefix"; then if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}g++", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}g++", so it can be a program name with args.
set dummy ${ac_tool_prefix}g++; ac_word=$2 set dummy ${ac_tool_prefix}g++; ac_word=$2
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
...@@ -4228,6 +4230,7 @@ else ...@@ -4228,6 +4230,7 @@ else
CXX="$ac_cv_prog_CXX" CXX="$ac_cv_prog_CXX"
fi fi
   
fi
   
   
   
......
...@@ -42,8 +42,11 @@ dnl support for cross compiling ...@@ -42,8 +42,11 @@ dnl support for cross compiling
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
dnl This is wrong!! dnl This is wrong!!
AC_CHECK_TOOL(CC, gcc) using_clang=`$CXX --version | grep ^clang | cut -f1 -d' '`
AC_CHECK_TOOL(CXX, g++) if test -z "$using_clang"; then
AC_CHECK_TOOL(CC, gcc)
AC_CHECK_TOOL(CXX, g++)
fi
CLICK_PROG_CC CLICK_PROG_CC
AC_PROG_CPP AC_PROG_CPP
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter