[clang][Driver] Add support for XROS_DEPLOYMENT_TARGET env var

[cyndyishida]

No description provided.

[llvmbot]

@llvm/pr-subscribers-clang-driver

Author: Cyndy Ishida (cyndyishida)

Changes

---

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

1 Files Affected:

• (modified) clang/lib/Driver/ToolChains/Darwin.h (+1-1)

diff --git a/clang/lib/Driver/ToolChains/Darwin.h b/clang/lib/Driver/ToolChains/Darwin.h
index 5e60b0841d6d5f..10d4b69e5d5f10 100644
--- a/clang/lib/Driver/ToolChains/Darwin.h
+++ b/clang/lib/Driver/ToolChains/Darwin.h
@@ -300,7 +300,7 @@ class LLVM_LIBRARY_VISIBILITY Darwin : public MachO {
     WatchOS,
     DriverKit,
     XROS,
-    LastDarwinPlatform = DriverKit
+    LastDarwinPlatform = XROS
   };
   enum DarwinEnvironmentKind {
     NativeEnvironment,

[llvmbot]

@llvm/pr-subscribers-clang

Author: Cyndy Ishida (cyndyishida)

Changes

---

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

1 Files Affected:

• (modified) clang/lib/Driver/ToolChains/Darwin.h (+1-1)

diff --git a/clang/lib/Driver/ToolChains/Darwin.h b/clang/lib/Driver/ToolChains/Darwin.h
index 5e60b0841d6d5f..10d4b69e5d5f10 100644
--- a/clang/lib/Driver/ToolChains/Darwin.h
+++ b/clang/lib/Driver/ToolChains/Darwin.h
@@ -300,7 +300,7 @@ class LLVM_LIBRARY_VISIBILITY Darwin : public MachO {
     WatchOS,
     DriverKit,
     XROS,
-    LastDarwinPlatform = DriverKit
+    LastDarwinPlatform = XROS
   };
   enum DarwinEnvironmentKind {
     NativeEnvironment,

[ributzka]

Why didn't this trigger:

llvm-project/clang/lib/Driver/ToolChains/Darwin.cpp

Line 1906 in ab92f62

static_assert(std::size(EnvVars) == Darwin::LastDarwinPlatform + 1,

?

[ributzka]

Why didn't this trigger:

llvm-project/clang/lib/Driver/ToolChains/Darwin.cpp

Line 1906 in ab92f62

static_assert(std::size(EnvVars) == Darwin::LastDarwinPlatform + 1,

?

XROS is missing in the env vars too:

llvm-project/clang/lib/Driver/ToolChains/Darwin.cpp

Line 1899 in ab92f62

const char *EnvVars[] = {

[cyndyishida]

Why didn't this trigger:

llvm-project/clang/lib/Driver/ToolChains/Darwin.cpp

Line 1906 in ab92f62

static_assert(std::size(EnvVars) == Darwin::LastDarwinPlatform + 1,

?

XROS is missing in the env vars too:

llvm-project/clang/lib/Driver/ToolChains/Darwin.cpp

Line 1899 in ab92f62

const char *EnvVars[] = {

Yes. Adding proper XROS_DEPLOYMENT_TARGET support is a bigger patch, I'll need to update this PR to reflect this.

[github-actions]

⚠️ C/C++ code formatter, clang-format found issues in your code. ⚠️

You can test this locally with the following command:

git-clang-format --diff ab92f6274b7c3a4b4445d47017bc481aa919545f 5a60725a1abf5a56c4a482c56ea91990074ee17c -- clang/test/Driver/xros-driver-requires-darwin-host.c clang/lib/Driver/ToolChains/Darwin.cpp clang/lib/Driver/ToolChains/Darwin.h

View the diff from clang-format here.

diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp
index cc1219d69d..0ee2b074a4 100644
--- a/clang/lib/Driver/ToolChains/Darwin.cpp
+++ b/clang/lib/Driver/ToolChains/Darwin.cpp
@@ -1897,13 +1897,9 @@ getDeploymentTargetFromEnvironmentVariables(const Driver &TheDriver,
                                             const llvm::Triple &Triple) {
   std::string Targets[Darwin::LastDarwinPlatform + 1];
   const char *EnvVars[] = {
-      "MACOSX_DEPLOYMENT_TARGET",
-      "IPHONEOS_DEPLOYMENT_TARGET",
-      "TVOS_DEPLOYMENT_TARGET",
-      "WATCHOS_DEPLOYMENT_TARGET",
-      "DRIVERKIT_DEPLOYMENT_TARGET",
-      "XROS_DEPLOYMENT_TARGET"
-  };
+      "MACOSX_DEPLOYMENT_TARGET",    "IPHONEOS_DEPLOYMENT_TARGET",
+      "TVOS_DEPLOYMENT_TARGET",      "WATCHOS_DEPLOYMENT_TARGET",
+      "DRIVERKIT_DEPLOYMENT_TARGET", "XROS_DEPLOYMENT_TARGET"};
   static_assert(std::size(EnvVars) == Darwin::LastDarwinPlatform + 1,
                 "Missing platform");
   for (const auto &I : llvm::enumerate(llvm::ArrayRef(EnvVars))) {

[cyndyishida]

ping

[ributzka]

LGTM