Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Modify compiler utility scripts to avoid bash, and allow for SDK vers…
…ion configuration.
  • Loading branch information
freakboy3742 committed Feb 23, 2024
commit ba946fbd63ba14cf29322b51377b32efa0d808c0
10 changes: 10 additions & 0 deletions iOS/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,16 @@ In this invocation:
retaining the ability to adapt to the local Xcode install. These scripts are
included in the ``bin`` directory of an iOS install.

These scripts will, by default, use the currently active Xcode installation.
If you want to use a different Xcode installation, you can use
``xcode-select`` to set a new default Xcode globally, or you can use the
``DEVELOPER_DIR`` environment variable to specify an Xcode install. The
scripts will use the default ``iphoneos``/``iphonesimulator`` SDK version for
the select Xcode install; if you want to use a different SDK, you can set the
``IOS_SDK_VERSION`` environment variable. (e.g, setting
``IOS_SDK_VERSION=17.1`` would cause the scripts to use the ``iphoneos17.1``
and ``iphonesimulator17.1`` SDKs, regardless of the Xcode default.)

The path has also been cleared of any user customizations. A common source of
bugs is for tools like Homebrew to accidentally leak macOS binaries into an iOS
build. Resetting the path to a known "bare bones" value is the easiest way to
Expand Down
4 changes: 2 additions & 2 deletions iOS/Resources/bin/arm64-apple-ios-ar
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash
xcrun --sdk iphoneos ar $@
#!/bin/sh
xcrun --sdk iphoneos${IOS_SDK_VERSION} ar $@
4 changes: 2 additions & 2 deletions iOS/Resources/bin/arm64-apple-ios-clang
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash
xcrun --sdk iphoneos clang -target arm64-apple-ios $@
#!/bin/sh
xcrun --sdk iphoneos${IOS_SDK_VERSION} clang -target arm64-apple-ios $@
4 changes: 2 additions & 2 deletions iOS/Resources/bin/arm64-apple-ios-cpp
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash
xcrun --sdk iphoneos clang -target arm64-apple-ios -E $@
#!/bin/sh
xcrun --sdk iphoneos${IOS_SDK_VERSION} clang -target arm64-apple-ios -E $@
4 changes: 2 additions & 2 deletions iOS/Resources/bin/arm64-apple-ios-simulator-ar
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash
xcrun --sdk iphonesimulator ar $@
#!/bin/sh
xcrun --sdk iphonesimulator${IOS_SDK_VERSION} ar $@
4 changes: 2 additions & 2 deletions iOS/Resources/bin/arm64-apple-ios-simulator-clang
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash
xcrun --sdk iphonesimulator clang -target arm64-apple-ios-simulator $@
#!/bin/sh
xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang -target arm64-apple-ios-simulator $@
4 changes: 2 additions & 2 deletions iOS/Resources/bin/arm64-apple-ios-simulator-cpp
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash
xcrun --sdk iphonesimulator clang -target arm64-apple-ios-simulator -E $@
#!/bin/sh
xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang -target arm64-apple-ios-simulator -E $@
4 changes: 2 additions & 2 deletions iOS/Resources/bin/x86_64-apple-ios-simulator-ar
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash
xcrun --sdk iphonesimulator ar $@
#!/bin/sh
xcrun --sdk iphonesimulator${IOS_SDK_VERSION} ar $@
4 changes: 2 additions & 2 deletions iOS/Resources/bin/x86_64-apple-ios-simulator-clang
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash
xcrun --sdk iphonesimulator clang -target x86_64-apple-ios-simulator $@
#!/bin/sh
xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang -target x86_64-apple-ios-simulator $@
4 changes: 2 additions & 2 deletions iOS/Resources/bin/x86_64-apple-ios-simulator-cpp
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash
xcrun --sdk iphonesimulator clang -target x86_64-apple-ios-simulator -E $@
#!/bin/sh
xcrun --sdk iphonesimulator${IOS_SDK_VERSION} clang -target x86_64-apple-ios-simulator -E $@