Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update toolchain + ldid rec #120

Merged
merged 1 commit into from
Jan 13, 2024
Merged

Update toolchain + ldid rec #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 4 additions & 7 deletions src/dragon/shscripts/prerun_checks
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,12 @@ elif [[ ${PLATFORM,,} == linux ]]; then
;;
esac

curl -LO https://github.com/sbingner/llvm-project/releases/latest/download/linux-ios-arm64e-clang-toolchain.tar.lzma
TMP=$(mktemp -d)
tar -xvf linux-ios-arm64e-clang-toolchain.tar.lzma -C $TMP
mkdir -p $DRAGON_ROOT_DIR/toolchain/linux/iphone
mv $TMP/ios-arm64e-clang-toolchain/* $DRAGON_ROOT_DIR/toolchain/linux/iphone/
rm -r linux-ios-arm64e-clang-toolchain.tar.lzma $TMP
curl -LO https://github.com/L1ghtmann/llvm-project/releases/download/test-e99a150/iOSToolchain.tar.xz
tar -xvf iOSToolchain.tar.xz -C $DRAGON_ROOT_DIR/toolchain/
rm iOSToolchain.tar.xz
elif ! [[ -x $DRAGON_ROOT_DIR/toolchain/linux/iphone/bin/ldid ]]; then
prefix_print "You appear to be missing ldid, but have the toolchain. Not sure how we got here honestly ..."
prefix_print "Please build or download ldid from https://github.com/sbingner/ldid or https://github.com/ProcursusTeam/ldid and place it in $DRAGON_ROOT_DIR/toolchain/linux/iphone/bin/."
prefix_print "Please build or download ldid from https://github.com/ProcursusTeam/ldid and place it in $DRAGON_ROOT_DIR/toolchain/linux/iphone/bin/."
drexit 1
fi
else
Expand Down
2 changes: 1 addition & 1 deletion src/dragongen/generation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ def generate_vars(self, module_variables: dict, target: str) -> dict:
if toolchain is None:
dberror("Dragon Gen", "Could not locate any usable toolchain or even determine the existence of clang.")
dberror("Dragon Gen", "If you're on macOS, install XCode and the Command Line Tools package")
dberror("Dragon Gen", "If you're on linux, install sbingner's iOS toolchain to ~/.dragon/toolchain")
dberror("Dragon Gen", "If you're on linux, install L1ghtmann's iOS toolchain to ~/.dragon/toolchain")
dberror("Dragon Gen", "You can also add the key 'objcs': True to your DragonMake module to have dragon automatically"
"install its internal toolchain, however note this isn't really reccomended for non-objcs "
"projects")
Expand Down