commit 3e7206ff0a9434b763f195e459e62e10c40750cc
author Junji Watanabe <jwata@google.com> Wed Jan 11 02:33:26 2023 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jan 11 02:33:26 2023 +0000
tree 8bffe7bfe83d5411749d9e4504001e5b5ecb452a
parent 3d8429ca2adaeade9512ded95d31dfd56ab924f1

Remove CPATH,LIBRARY_PATH,SDKROOT env vars set by macOS python3

macOS python3 sets those env vars implicitly. https://openradar.appspot.com/radar?id=5608755232243712

Removing them to avoid changing clang's behaviors.

Fixed: 1403485
Change-Id: I2ecf0cad8a1f69f5d7d180d2a2a003ce97365f3f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4149962
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Auto-Submit: Junji Watanabe <jwata@google.com>

ninja.py

diff --git a/ninja.py b/ninja.py
index a8f679e..46ea636 100755
--- a/ninja.py
+++ b/ninja.py
@@ -75,6 +75,15 @@
   if (sys.platform.startswith('win') and len(args) == 2):
     args = args[:1] + args[1].split(' ')
 
+  # macOS's python sets CPATH, LIBRARY_PATH, SDKROOT implicitly.
+  # https://openradar.appspot.com/radar?id=5608755232243712
+  #
+  # Removing thoese environment variables to avoid affecting clang's behaviors.
+  if sys.platform == 'darwin':
+    os.environ.pop("CPATH", None)
+    os.environ.pop("LIBRARY_PATH", None)
+    os.environ.pop("SDKROOT", None)
+
   # Get gclient root + src.
   primary_solution_path = gclient_paths.GetPrimarySolutionPath()
   gclient_root_path = gclient_paths.FindGclientRoot(os.getcwd())