Update toolchain + ldid rec

DragonBuild · Jan 11, 2024 · 938c7c9 · 938c7c9
1 parent e2a1930
commit 938c7c9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/dragon/shscripts/prerun_checks b/src/dragon/shscripts/prerun_checks
@@ -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

diff --git a/src/dragongen/generation.py b/src/dragongen/generation.py
@@ -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")