build_symbolizer.sh: Ensure libcxx include path comes first

[MatzeB]

libc++ expects to come first in the search path, before libc. See for example: https://github.com/llvm/llvm-project/blob/main/libcxx/include/cstddef#L45

Make sure the C++ include path comes first even if custom paths to libc and other packages are passed in via the FLAGS variable.

[llvmbot]

@llvm/pr-subscribers-compiler-rt-sanitizer

Author: Matthias Braun (MatzeB)

Changes

libc++ expects to come first in the search path, before libc. See for example: https://github.com/llvm/llvm-project/blob/main/libcxx/include/cstddef#L45

Make sure the C++ include path comes first even if custom paths to libc and other packages are passed in via the FLAGS variable.

---

Full diff: https://github.com/llvm/llvm-project/pull/149431.diff

1 Files Affected:

• (modified) compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh (+1-1)

diff --git a/compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh b/compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh
index 4d435976d3a10..c13a94f1279e1 100755
--- a/compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh
+++ b/compiler-rt/lib/sanitizer_common/symbolizer/scripts/build_symbolizer.sh
@@ -120,7 +120,7 @@ ninja cxx cxxabi && ninja install-cxx install-cxxabi
 
 FLAGS="${FLAGS} -fno-rtti -fno-exceptions"
 LLVM_CFLAGS="${FLAGS} -Wno-global-constructors"
-LLVM_CXXFLAGS="${LLVM_CFLAGS} -nostdinc++ -I${ZLIB_BUILD} -isystem ${LIBCXX_INSTALL}/include -isystem ${LIBCXX_INSTALL}/include/c++/v1"
+LLVM_CXXFLAGS="-isystem ${LIBCXX_INSTALL}/include/c++/v1 ${LLVM_CFLAGS} -nostdinc++ -I${ZLIB_BUILD}"
 
 # Build LLVM.
 if [[ ! -f ${LLVM_BUILD}/build.ninja ]]; then