commit f21618bae2f4464af61623846b94d4f6826f9d2c
author Armando Montanez <amontanez@google.com> Mon Aug 15 18:40:09 2022 +0000
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon Aug 15 18:40:09 2022 +0000
tree 6f9ee79edb67587512bbb7c6c88f81a0f327d8c2
parent 3bac75d77b9b492f23243f66f1e332f3fbd64c8c

pw_toolchain: Fix OSS Fuzz libc++ not found

Excludes OSS Fuzz from using the CIPD-provided sysroot since OSS Fuzz
relies on libc++ (which is not included in the CIPD sysroot) rather than
libstdc++.

Bug: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=50221
Change-Id: I9fb7ed091f5573f693a88be12edd725cfaf26c1a
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/106591
Reviewed-by: Erik Gilling <konkers@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>
Pigweed-Auto-Submit: Armando Montanez <amontanez@google.com>

pw_toolchain/host_clang/toolchains.gni

diff --git a/pw_toolchain/host_clang/toolchains.gni b/pw_toolchain/host_clang/toolchains.gni
index 12ab527..a1106a8 100644
--- a/pw_toolchain/host_clang/toolchains.gni
+++ b/pw_toolchain/host_clang/toolchains.gni
@@ -54,8 +54,13 @@
     "$dir_pw_build:extra_debugging",
     "$dir_pw_toolchain/host_clang:no_system_libcpp",
     "$dir_pw_toolchain/host_clang:xcode_sysroot",
-    "$dir_pw_toolchain/host_clang:linux_sysroot",
   ]
+
+  # OSS-Fuzz uses -stdlib=libc++, which isn't included in the CIPD-provided
+  # Linux sysroot (it instead provides libstdc++).
+  if (!pw_toolchain_OSS_FUZZ_ENABLED) {
+    default_configs += [ "$dir_pw_toolchain/host_clang:linux_sysroot" ]
+  }
 }
 
 pw_toolchain_host_clang = {