commit 65fe5e086d805877fd29515ac520c349cefd6aa5
author Nico Weber <thakis@chromium.org> Thu Feb 18 14:40:14 2021 -0500
committer Copybara-Service <copybara-worker@google.com> Fri Feb 19 03:39:18 2021 -0800
tree 6c17101a009b3ccf222f8ab146ae5ca3fea98468
parent 1d6e69774c51b3e09e771c32fa5d78ecdd320bdb

[gn build] try to fix libxml2 include path on mac after 0ec448194e29

GitOrigin-RevId: 9fa11201618d8ad3a978815d90d3e64d8e0fa310

utils/gn/build/BUILD.gn

diff --git a/utils/gn/build/BUILD.gn b/utils/gn/build/BUILD.gn
index 6f63592..907520b 100644
--- a/utils/gn/build/BUILD.gn
+++ b/utils/gn/build/BUILD.gn
@@ -283,11 +283,11 @@
     }
     cflags += [
       "-isysroot",
-      sdk_path,
+      rebase_path(sdk_path, root_build_dir),
     ]
     ldflags += [
       "-isysroot",
-      sdk_path,
+      rebase_path(sdk_path, root_build_dir),
     ]
   }
   if (sysroot != "" && current_os != "win" && is_clang) {

utils/gn/build/mac_sdk.gni

diff --git a/utils/gn/build/mac_sdk.gni b/utils/gn/build/mac_sdk.gni
index 51cc56c..af7044b 100644
--- a/utils/gn/build/mac_sdk.gni
+++ b/utils/gn/build/mac_sdk.gni
@@ -25,8 +25,7 @@
     iossim_sdk_path = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk"
   }
 } else {
-  ios_sdk_path = rebase_path(sysroot, root_build_dir) + "/iPhoneOS.sdk"
-  iossim_sdk_path =
-      rebase_path(sysroot, root_build_dir) + "/iPhoneSimulator.sdk"
-  mac_sdk_path = rebase_path(sysroot, root_build_dir) + "/MacOSX.sdk"
+  ios_sdk_path = sysroot + "/iPhoneOS.sdk"
+  iossim_sdk_path = sysroot + "/iPhoneSimulator.sdk"
+  mac_sdk_path = sysroot + "/MacOSX.sdk"
 }