ICU-22556 Add Linux/clang platform to the runConfigureICU script

unicode-org · Feb 16, 2024 · 1783915 · 1783915
1 parent f8c06b6
commit 1783915
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/docs/devsetup/cpp/index.md b/docs/devsetup/cpp/index.md
@@ -70,7 +70,7 @@ For example:
         --disable-release Linux --prefix=/home/*your_user_name*/icu/mine/inst >
         config.out 2>&1`
     *   build: make -j5 check > out.txt 2>&1
-    *   Be sure to test with gcc and g++ too! `CC=gcc CXX=g++
+    *   Be sure to test with both gcc/g++ and clang/clang++! `CC=clang CXX=clang++
         CXXFLAGS="-DU_USING_ICU_NAMESPACE=0"
         CPPFLAGS="-DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1"
         ../../src/icu4c/source/runConfigureICU --enable-debug --disable-release

diff --git a/docs/devsetup/cpp/linux.md b/docs/devsetup/cpp/linux.md
@@ -81,7 +81,7 @@ the configure options for building ICU with the address checker:
 
 ```
 CPPFLAGS=-fsanitize=address LDFLAGS=-fsanitize=address ./runConfigureICU
---enable-debug --disable-release Linux --disable-renaming
+--enable-debug --disable-release Linux/clang --disable-renaming
 ```
 
 The other available sanitizers are `thread`, `memory` and `undefined` behavior.

diff --git a/docs/processes/release/tasks/healthy-code.md b/docs/processes/release/tasks/healthy-code.md
@@ -605,7 +605,7 @@ tests. These instructions run the sanitizer on the entire test suite. The clang
 compiler is required.
 
 ```sh
-$ CPPFLAGS=-fsanitize=thread LDFLAGS=-fsanitize=thread ./runConfigureICU --enable-debug --disable-release Linux --disable-renaming
+$ CPPFLAGS=-fsanitize=thread LDFLAGS=-fsanitize=thread ./runConfigureICU --enable-debug --disable-release Linux/clang --disable-renaming
 $ make clean
 $ make -j -l2.5 check
 ```
diff --git a/docs/processes/release/tasks/integration.md b/docs/processes/release/tasks/integration.md
@@ -431,7 +431,7 @@ To run manually, on a Linux system with clang,
 
 ```sh
 cd icu4c/source
-CPPFLAGS=-fsanitize=thread LDFLAGS=-fsanitize=thread ./runConfigureICU --enable-debug --disable-release Linux
+CPPFLAGS=-fsanitize=thread LDFLAGS=-fsanitize=thread ./runConfigureICU --enable-debug --disable-release Linux/clang
 make clean
 make -j -l2.5 check
 ```
@@ -449,7 +449,7 @@ To run manually, on a Linux system with clang,
 
 ```sh
 cd icu4c/source
-CPPFLAGS=-fsanitize=address LDFLAGS=-fsanitize=address ./runConfigureICU --enable-debug --disable-release Linux
+CPPFLAGS=-fsanitize=address LDFLAGS=-fsanitize=address ./runConfigureICU --enable-debug --disable-release Linux/clang
 make clean
 make -j -l2.5 check
 ```

diff --git a/icu4c/source/runConfigureICU b/icu4c/source/runConfigureICU
@@ -46,7 +46,8 @@ The following names can be supplied as the argument for platform:
     FreeBSD             Use the clang/clang++ or GNU gcc/g++ compilers on FreeBSD
     HP-UX/ACC           Use the HP ANSI C/Advanced C++ compilers on HP-UX 11
     IBMi                Use the iCC compilers on IBM i, i5/OS, OS/400
-    Linux               Use the clang/clang++ or GNU gcc/g++ compilers on Linux
+    Linux               Use the default cc/c++ compilers on Linux
+    Linux/clang         Use the clang/clang++ compilers on Linux
     Linux/gcc           Use the GNU gcc/g++ compilers on Linux
     Linux/ECC           Use the Intel ECC compiler on Linux
     Linux/ICC           Use the Intel ICC compiler on Linux
@@ -259,9 +260,19 @@ case $platform in
         DEBUG_CFLAGS='-g'
         DEBUG_CXXFLAGS='-g'
         ;;
+    Linux/clang)
+        THE_OS="Linux"
+        THE_COMP="the Clang C++"
+        CC=clang; export CC
+        CXX=clang++; export CXX
+        RELEASE_CFLAGS='-O3'
+        RELEASE_CXXFLAGS='-O3'
+        DEBUG_CFLAGS='-g'
+        DEBUG_CXXFLAGS='-g'
+        ;;
     Linux*)
         THE_OS="Linux"
-        THE_COMP="the clang or else GNU C++"
+        THE_COMP="the default C++"
         RELEASE_CFLAGS='-O3'
         RELEASE_CXXFLAGS='-O3'
         DEBUG_CFLAGS='-g'