Skip to content

Commit

Permalink
[3.13] pythongh-127434: Fix iOS xcrun --sdk clang/ar scripts to all…
Browse files Browse the repository at this point in the history
…ow arguments with spaces (pythonGH-127575)

Added shell escaping to ensure iOS compiler shims can accept arguments with spaces.
(cherry picked from commit 6cf7794)

Co-authored-by: Feodor Fitsner <[email protected]>
  • Loading branch information
FeodorFitsner authored and freakboy3742 committed Dec 5, 2024
1 parent 4060ef3 commit 336e62d
Show file tree
Hide file tree
Showing 13 changed files with 13 additions and 12 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The iOS compiler shims can now accept arguments with spaces.
2 changes: 1 addition & 1 deletion iOS/Resources/bin/arm64-apple-ios-ar
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
xcrun --sdk iphoneos${IOS_SDK_VERSION} ar $@
xcrun --sdk iphoneos${IOS_SDK_VERSION} ar "$@"
2 changes: 1 addition & 1 deletion iOS/Resources/bin/arm64-apple-ios-clang
Original file line number Diff line number Diff line change
@@ -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 "$@"
2 changes: 1 addition & 1 deletion iOS/Resources/bin/arm64-apple-ios-clang++
Original file line number Diff line number Diff line change
@@ -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 "$@"
2 changes: 1 addition & 1 deletion iOS/Resources/bin/arm64-apple-ios-cpp
Original file line number Diff line number Diff line change
@@ -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 "$@"
2 changes: 1 addition & 1 deletion iOS/Resources/bin/arm64-apple-ios-simulator-ar
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
xcrun --sdk iphonesimulator${IOS_SDK_VERSION} ar $@
xcrun --sdk iphonesimulator${IOS_SDK_VERSION} ar "$@"
2 changes: 1 addition & 1 deletion iOS/Resources/bin/arm64-apple-ios-simulator-clang
Original file line number Diff line number Diff line change
@@ -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 "$@"
2 changes: 1 addition & 1 deletion iOS/Resources/bin/arm64-apple-ios-simulator-clang++
Original file line number Diff line number Diff line change
@@ -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 "$@"
2 changes: 1 addition & 1 deletion iOS/Resources/bin/arm64-apple-ios-simulator-cpp
Original file line number Diff line number Diff line change
@@ -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 "$@"
2 changes: 1 addition & 1 deletion iOS/Resources/bin/x86_64-apple-ios-simulator-ar
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
xcrun --sdk iphonesimulator${IOS_SDK_VERSION} ar $@
xcrun --sdk iphonesimulator${IOS_SDK_VERSION} ar "$@"
2 changes: 1 addition & 1 deletion iOS/Resources/bin/x86_64-apple-ios-simulator-clang
Original file line number Diff line number Diff line change
@@ -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 "$@"
2 changes: 1 addition & 1 deletion iOS/Resources/bin/x86_64-apple-ios-simulator-clang++
Original file line number Diff line number Diff line change
@@ -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 "$@"
2 changes: 1 addition & 1 deletion iOS/Resources/bin/x86_64-apple-ios-simulator-cpp
Original file line number Diff line number Diff line change
@@ -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 "$@"

0 comments on commit 336e62d

Please sign in to comment.