[llvm] 9fa1120 - [gn build] try to fix libxml2 include path on mac after 0ec448194e29

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2021-02-18T14:40:14-05:00
New Revision: 9fa11201618d8ad3a978815d90d3e64d8e0fa310

URL: https://github.com/llvm/llvm-project/commit/9fa11201618d8ad3a978815d90d3e64d8e0fa310
DIFF: https://github.com/llvm/llvm-project/commit/9fa11201618d8ad3a978815d90d3e64d8e0fa310.diff

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

Added: 
    

Modified: 
    llvm/utils/gn/build/BUILD.gn
    llvm/utils/gn/build/mac_sdk.gni

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/build/BUILD.gn b/llvm/utils/gn/build/BUILD.gn
index 6f63592761ed..907520b16d33 100644
--- a/llvm/utils/gn/build/BUILD.gn
+++ b/llvm/utils/gn/build/BUILD.gn
@@ -283,11 +283,11 @@ config("compiler_defaults") {
     }
     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) {

diff  --git a/llvm/utils/gn/build/mac_sdk.gni b/llvm/utils/gn/build/mac_sdk.gni
index 51cc56cd9797..af7044ba5c96 100644
--- a/llvm/utils/gn/build/mac_sdk.gni
+++ b/llvm/utils/gn/build/mac_sdk.gni
@@ -25,8 +25,7 @@ if (sysroot == "") {
     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"
 }