chocolate-doom/chocpkg
0
0
Fork 0
mirror of https://github.com/chocolate-doom/chocpkg.git synced 2024-11-13 00:24:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change emscripten target name to wasm32-unknown-emscripten.

Browse source 
This seems to be what emscripten identifies itself as internally,
so this name may be marginally better.
This commit is contained in:
Simon Howard 2024-01-25 20:06:05 -05:00
parent 3040608d56
commit a314c83753
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
buildenv.sh
View file

@ -7,8 +7,8 @@ BUILD_HOST=
#BUILD_HOST=i686-w64-mingw32 #BUILD_HOST=i686-w64-mingw32
# Build host to use for Emscripten builds. Uncomment and then run # Build host to use for Emscripten builds. Uncomment and then run
# `chocpkg install native:emscripten`. # `chocpkg install emscripten`.
#BUILD_HOST=asmjs-local-emscripten BUILD_HOST=wasm32-unknown-emscripten
# If we're cross-compiling to a different platform, this should be set # If we're cross-compiling to a different platform, this should be set
# to true. We initialize this based on whether BUILD_HOST has been set. # to true. We initialize this based on whether BUILD_HOST has been set.

6
pkgdef/emscripten.sh
View file

@ -10,7 +10,7 @@ make_wrapper_script() {
local toolname emtoolname path local toolname emtoolname path
toolname="$1" toolname="$1"
emtoolname="$2" emtoolname="$2"
path="$PACKAGE_INSTALL_DIR/bin/asmjs-local-emscripten-$toolname" path="$PACKAGE_INSTALL_DIR/bin/wasm32-unknown-emscripten-$toolname"
mkdir -p "$PACKAGE_INSTALL_DIR/bin" mkdir -p "$PACKAGE_INSTALL_DIR/bin"
(echo "#!/bin/bash" (echo "#!/bin/bash"
echo ". $PACKAGE_BUILD_DIR/emsdk_env.sh >/dev/null" echo ". $PACKAGE_BUILD_DIR/emsdk_env.sh >/dev/null"
@ -21,7 +21,7 @@ make_wrapper_script() {
# Emscripten is a weird beast, and wants us to use all its weird tools # Emscripten is a weird beast, and wants us to use all its weird tools
# (emconfigure, emmake, etc.). Instead of that, we define a "fake" system # (emconfigure, emmake, etc.). Instead of that, we define a "fake" system
# named asmjs-local-emscripten and create wrapper scripts for all the # named wasm32-unknown-emscripten and create wrapper scripts for all the
# necessary compile tools. Then we can build like any other normal # necessary compile tools. Then we can build like any other normal
# cross-compile system. # cross-compile system.
do_install() { do_install() {
@ -33,5 +33,5 @@ do_install() {
make_wrapper_script ranlib emranlib make_wrapper_script ranlib emranlib
} }
check_tool asmjs-local-emscripten-gcc check_tool wasm32-unknown-emscripten-gcc