This repository was archived by the owner on Feb 25, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 6k
Use buildroot clang for scenario app #21690
Merged
fluttergithubbot
merged 8 commits into
flutter:master
from
LongCatIsLooong:force-ios13-test
Oct 12, 2020
Merged
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
46777f0
test
LongCatIsLooong 8f131dd
use ld in PATH
LongCatIsLooong 959ab17
update comments
LongCatIsLooong e43030b
use buildroot clang
LongCatIsLooong 669b135
Apply suggestions from code review
LongCatIsLooong 74ce970
update comment
LongCatIsLooong 06be0b0
Merge branch 'force-ios13-test' of github.com:LongCatIsLooong/engine …
LongCatIsLooong c8c9a10
Merge remote-tracking branch 'upstream/master' into force-ios13-test
LongCatIsLooong File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -85,12 +85,19 @@ echo "Compiling JIT Snapshot..." | |
|
||
cp "$DEVICE_TOOLS/../gen/flutter/lib/snapshot/vm_isolate_snapshot.bin" "$OUTDIR/App.framework/flutter_assets/vm_snapshot_data" | ||
|
||
LLVM_BIN_PATH="../../../buildtools/mac-x64/clang/bin" | ||
SYSROOT=$(xcrun --sdk iphonesimulator --show-sdk-path) | ||
echo "Using $SYSROOT as sysroot." | ||
|
||
echo "Creating stub App using $SYSROOT..." | ||
|
||
echo "static const int Moo = 88;" | xcrun clang -x c \ | ||
# Use the ld specified in PATH instead of the one from the active xcode | ||
# toolchain (the default). | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: update this comment to reflect actual change please |
||
# | ||
# When linking against a newer iOS SDK (newer SYSROOT) with an older version of | ||
# clang, the linker from the old toolchain may refuse to link against new TAPI | ||
# files provided in the new SDK. See: https://github.com/flutter/flutter/issues/65901 | ||
echo "static const int Moo = 88;" | $LLVM_BIN_PATH/clang -x c \ | ||
LongCatIsLooong marked this conversation as resolved.
Show resolved
Hide resolved
|
||
-arch x86_64 \ | ||
-fembed-bitcode-marker \ | ||
-isysroot "$SYSROOT" \ | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.