https://github.com/python/cpython/commit/6cf77949fba7b44f6885794b2028f091f42f5d6c
commit: 6cf77949fba7b44f6885794b2028f091f42f5d6c
branch: main
author: Feodor Fitsner <[email protected]>
committer: freakboy3742 <[email protected]>
date: 2024-12-05T11:00:20+08:00
summary:
gh-127434: Fix iOS `xcrun --sdk` clang/ar scripts to allow arguments with
spaces (#127575)
Added shell escaping to ensure iOS compiler shims can accept arguments with
spaces.
files:
A
Misc/NEWS.d/next/Core_and_Builtins/2024-12-04-09-52-08.gh-issue-127434.RjkGT_.rst
M iOS/Resources/bin/arm64-apple-ios-ar
M iOS/Resources/bin/arm64-apple-ios-clang
M iOS/Resources/bin/arm64-apple-ios-clang++
M iOS/Resources/bin/arm64-apple-ios-cpp
M iOS/Resources/bin/arm64-apple-ios-simulator-ar
M iOS/Resources/bin/arm64-apple-ios-simulator-clang
M iOS/Resources/bin/arm64-apple-ios-simulator-clang++
M iOS/Resources/bin/arm64-apple-ios-simulator-cpp
M iOS/Resources/bin/x86_64-apple-ios-simulator-ar
M iOS/Resources/bin/x86_64-apple-ios-simulator-clang
M iOS/Resources/bin/x86_64-apple-ios-simulator-clang++
M iOS/Resources/bin/x86_64-apple-ios-simulator-cpp
diff --git
a/Misc/NEWS.d/next/Core_and_Builtins/2024-12-04-09-52-08.gh-issue-127434.RjkGT_.rst
b/Misc/NEWS.d/next/Core_and_Builtins/2024-12-04-09-52-08.gh-issue-127434.RjkGT_.rst
new file mode 100644
index 00000000000000..08b27a7890bb1c
--- /dev/null
+++
b/Misc/NEWS.d/next/Core_and_Builtins/2024-12-04-09-52-08.gh-issue-127434.RjkGT_.rst
@@ -0,0 +1 @@
+The iOS compiler shims can now accept arguments with spaces.
diff --git a/iOS/Resources/bin/arm64-apple-ios-ar
b/iOS/Resources/bin/arm64-apple-ios-ar
index 8122332b9c1de0..3cf3eb218741fa 100755
--- a/iOS/Resources/bin/arm64-apple-ios-ar
+++ b/iOS/Resources/bin/arm64-apple-ios-ar
@@ -1,2 +1,2 @@
#!/bin/sh
-xcrun --sdk iphoneos${IOS_SDK_VERSION} ar $@
+xcrun --sdk iphoneos${IOS_SDK_VERSION} ar "$@"
diff --git a/iOS/Resources/bin/arm64-apple-ios-clang
b/iOS/Resources/bin/arm64-apple-ios-clang
index 4d525751eba798..c39519cd1f8c94 100755
--- a/iOS/Resources/bin/arm64-apple-ios-clang
+++ b/iOS/Resources/bin/arm64-apple-ios-clang
@@ -1,2 +1,2 @@
#!/bin/sh
-xcrun --sdk iphoneos${IOS_SDK_VERSION} clang -target arm64-apple-ios $@
+xcrun --sdk iphoneos${IOS_SDK_VERSION} clang -target arm64-apple-ios "$@"
diff --git a/iOS/Resources/bin/arm64-apple-ios-clang++
b/iOS/Resources/bin/arm64-apple-ios-clang++
index f24bec11268f7e..d9b12925f384b9 100755
--- a/iOS/Resources/bin/arm64-apple-ios-clang++
+++ b/iOS/Resources/bin/arm64-apple-ios-clang++
@@ -1,2 +1,2 @@
#!/bin/sh
-xcrun --sdk iphoneos${IOS_SDK_VERSION} clang++ -target arm64-apple-ios $@
+xcrun --sdk iphoneos${IOS_SDK_VERSION} clang++ -target arm64-apple-ios "$@"
diff --git a/iOS/Resources/bin/arm64-apple-ios-cpp
b/iOS/Resources/bin/arm64-apple-ios-cpp
index 891bb25bb4318c..24da23d3448ae0 100755
--- a/iOS/Resources/bin/arm64-apple-ios-cpp
+++ b/iOS/Resources/bin/arm64-apple-ios-cpp
@@ -1,2 +1,2 @@
#!/bin/sh
-xcrun --sdk iphoneos${IOS_SDK_VERSION} clang -target arm64-apple-ios -E $@
+xcrun --sdk iphoneos${IOS_SDK_VERSION} clang -target arm64-apple-ios -E "$@"
diff --git a/iOS/Resources/bin/arm64-apple-ios-simulator-ar
b/iOS/Resources/bin/arm64-apple-ios-simulator-ar
index 74ed3bc6df1c2b..b836b6db9025bb 100755
--- a/iOS/Resources/bin/arm64-apple-ios-simulator-ar
+++ b/iOS/Resources/bin/arm64-apple-ios-simulator-ar
@@ -1,2 +1,2 @@
#!/bin/sh
-xcrun --sdk iphonesimulator${IOS_SDK_VERSION} ar $@
+xcrun --sdk iphonesimulator${IOS_SDK_VERSION} ar "$@"
diff --git a/iOS/Resources/bin/arm64-apple-ios-simulator-clang
b/iOS/Resources/bin/arm64-apple-ios-simulator-clang
index 32574cad284441..92e8d853d6ebc3 100755
--- a/iOS/Resources/bin/arm64-apple-ios-simulator-clang
+++ b/iOS/Resources/bin/arm64-apple-ios-simulator-clang
@@ -1,2 +1,2 @@
#!/bin/sh
-xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang -target
arm64-apple-ios-simulator $@
+xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang -target
arm64-apple-ios-simulator "$@"
diff --git a/iOS/Resources/bin/arm64-apple-ios-simulator-clang++
b/iOS/Resources/bin/arm64-apple-ios-simulator-clang++
index ef37d05b512959..076469cc70cf98 100755
--- a/iOS/Resources/bin/arm64-apple-ios-simulator-clang++
+++ b/iOS/Resources/bin/arm64-apple-ios-simulator-clang++
@@ -1,2 +1,2 @@
#!/bin/sh
-xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang++ -target
arm64-apple-ios-simulator $@
+xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang++ -target
arm64-apple-ios-simulator "$@"
diff --git a/iOS/Resources/bin/arm64-apple-ios-simulator-cpp
b/iOS/Resources/bin/arm64-apple-ios-simulator-cpp
index 6aaf6fbe188c32..c57f28cee5bcfe 100755
--- a/iOS/Resources/bin/arm64-apple-ios-simulator-cpp
+++ b/iOS/Resources/bin/arm64-apple-ios-simulator-cpp
@@ -1,2 +1,2 @@
#!/bin/sh
-xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang -target
arm64-apple-ios-simulator -E $@
+xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang -target
arm64-apple-ios-simulator -E "$@"
diff --git a/iOS/Resources/bin/x86_64-apple-ios-simulator-ar
b/iOS/Resources/bin/x86_64-apple-ios-simulator-ar
index 74ed3bc6df1c2b..b836b6db9025bb 100755
--- a/iOS/Resources/bin/x86_64-apple-ios-simulator-ar
+++ b/iOS/Resources/bin/x86_64-apple-ios-simulator-ar
@@ -1,2 +1,2 @@
#!/bin/sh
-xcrun --sdk iphonesimulator${IOS_SDK_VERSION} ar $@
+xcrun --sdk iphonesimulator${IOS_SDK_VERSION} ar "$@"
diff --git a/iOS/Resources/bin/x86_64-apple-ios-simulator-clang
b/iOS/Resources/bin/x86_64-apple-ios-simulator-clang
index bcbe91f6061e16..17cbe0c8a1e213 100755
--- a/iOS/Resources/bin/x86_64-apple-ios-simulator-clang
+++ b/iOS/Resources/bin/x86_64-apple-ios-simulator-clang
@@ -1,2 +1,2 @@
#!/bin/sh
-xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang -target
x86_64-apple-ios-simulator $@
+xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang -target
x86_64-apple-ios-simulator "$@"
diff --git a/iOS/Resources/bin/x86_64-apple-ios-simulator-clang++
b/iOS/Resources/bin/x86_64-apple-ios-simulator-clang++
index 86f03ea32bc2fd..565d47b24c214b 100755
--- a/iOS/Resources/bin/x86_64-apple-ios-simulator-clang++
+++ b/iOS/Resources/bin/x86_64-apple-ios-simulator-clang++
@@ -1,2 +1,2 @@
#!/bin/sh
-xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang++ -target
x86_64-apple-ios-simulator $@
+xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang++ -target
x86_64-apple-ios-simulator "$@"
diff --git a/iOS/Resources/bin/x86_64-apple-ios-simulator-cpp
b/iOS/Resources/bin/x86_64-apple-ios-simulator-cpp
index e6a42d9b85dec7..63fc8e8de2d38d 100755
--- a/iOS/Resources/bin/x86_64-apple-ios-simulator-cpp
+++ b/iOS/Resources/bin/x86_64-apple-ios-simulator-cpp
@@ -1,2 +1,2 @@
#!/bin/sh
-xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang -target
x86_64-apple-ios-simulator -E $@
+xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang -target
x86_64-apple-ios-simulator -E "$@"
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
