diff options
Diffstat (limited to 'Build/source/libs/icu/TLpatches/patch-01-configure-gcc')
-rw-r--r-- | Build/source/libs/icu/TLpatches/patch-01-configure-gcc | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/Build/source/libs/icu/TLpatches/patch-01-configure-gcc b/Build/source/libs/icu/TLpatches/patch-01-configure-gcc new file mode 100644 index 00000000000..c88942972a3 --- /dev/null +++ b/Build/source/libs/icu/TLpatches/patch-01-configure-gcc @@ -0,0 +1,60 @@ + For TL, we do not want to prefer clang(++) for ICU + when the whole rest of the tree prefers gcc. + +Index: source/configure +=================================================================== +--- source/configure (revision 43491) ++++ source/configure (working copy) +@@ -2830,7 +2830,7 @@ + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' + ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test -n "$ac_tool_prefix"; then +- for ac_prog in clang gcc cc c99 c89 xlc_r xlc cl.exe icc ++ for ac_prog in gcc cc clang c99 c89 xlc_r xlc cl.exe icc + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +@@ -2874,7 +2874,7 @@ + fi + if test -z "$CC"; then + ac_ct_CC=$CC +- for ac_prog in clang gcc cc c99 c89 xlc_r xlc cl.exe icc ++ for ac_prog in gcc cc clang c99 c89 xlc_r xlc cl.exe icc + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +@@ -3433,7 +3433,7 @@ + CXX=$CCC + else + if test -n "$ac_tool_prefix"; then +- for ac_prog in clang++ g++ c++ gpp xlC_r xlC aCC CC cxx cc++ cl.exe icc FCC KCC RCC ++ for ac_prog in g++ c++ clang++ gpp xlC_r xlC aCC CC cxx cc++ cl.exe icc FCC KCC RCC + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. + set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +@@ -3477,7 +3477,7 @@ + fi + if test -z "$CXX"; then + ac_ct_CXX=$CXX +- for ac_prog in clang++ g++ c++ gpp xlC_r xlC aCC CC cxx cc++ cl.exe icc FCC KCC RCC ++ for ac_prog in g++ c++ clang++ gpp xlC_r xlC aCC CC cxx cc++ cl.exe icc FCC KCC RCC + do + # Extract the first word of "$ac_prog", so it can be a program name with args. + set dummy $ac_prog; ac_word=$2 +Index: source/configure.ac +=================================================================== +--- source/configure.ac (revision 43491) ++++ source/configure.ac (working copy) +@@ -133,10 +133,10 @@ + : ${CXXFLAGS=""} + + # Checks for compilers +-AC_PROG_CC([clang gcc cc c99 c89 xlc_r xlc cl.exe icc]) ++AC_PROG_CC([gcc cc clang c99 c89 xlc_r xlc cl.exe icc]) + # Make sure that we try clang++ first, which provides C++11 support. + # The g++ compiler is less likely to support C++11. +-AC_PROG_CXX([clang++ g++ c++ gpp xlC_r xlC aCC CC cxx cc++ cl.exe icc FCC KCC RCC]) ++AC_PROG_CXX([g++ c++ clang++ gpp xlC_r xlC aCC CC cxx cc++ cl.exe icc FCC KCC RCC]) + + # pkg-config is needed for harfbuzz support + PKG_PROG_PKG_CONFIG([0.20]) |