emscripten: arm64 macOS is now supported, bump to 4.0.5

Author: Ghabry

emscripten/1_download_library.sh

@@ -25,14 +25,6 @@ if hash emcc >/dev/null 2>&1; then
 else
 	echo "Preparing portable SDK"
 
-	if [ $os = "Darwin" ] ; then
-		if [ "$(uname -m)" = "arm64" ] ; then
-			echo "macOS arm64 requires a preinstalled emscripten."
-			echo "Run 'brew install emscripten' to install it."
-			exit 1
-		fi
-	fi
-
 	rm -rf emsdk-portable
 	git_clone https://github.com/emscripten-core/emsdk.git emsdk-portable
 
@@ -43,8 +35,8 @@ else
 	touch .emscripten
 
 	# Download and install the latest SDK tools and set up the compiler configuration to point to it.
-	./emsdk install 3.1.74
-	./emsdk activate 3.1.74
+	./emsdk install 4.0.5
+	./emsdk activate 4.0.5
 
 	# Set the current Emscripten path
 	source ./emsdk_env.sh

emscripten/2_build_toolchain.sh

@@ -29,6 +29,15 @@ if [ ! -f .patches-applied ]; then
 		autoreconf -fi
 	)
 
+	# Make wasm32-unknown-emscripten available
+	(cd $LIBOGG_DIR
+		autoreconf -fi
+	)
+
+	(cd $LIBVORBIS_DIR
+		autoreconf -fi
+	)
+
 	# disable unsupported compiler flags by emcc clang in libogg
 	perl -pi -e 's/-O20/-g0 -O2/g' $LIBOGG_DIR/configure
 
@@ -68,6 +77,8 @@ function set_build_flags {
 	export EM_PKG_CONFIG_PATH="$PLATFORM_PREFIX/lib/pkgconfig"
 	export CMAKE_EXTRA_ARGS="-DCMAKE_FIND_ROOT_PATH=$PLATFORM_PREFIX"
 
+	export TARGET_HOST="wasm32-unknown-emscripten"
+
 	# force mmap support in mpg123 (actually unused, but needed for building)
 	export ac_cv_func_mmap_fixed_mapped=yes
 
@@ -89,12 +100,6 @@ cd $WORKSPACE
 # Install libraries
 set_build_flags
 
-if [ $os = "Darwin" ] ; then
-	# Workaround wrong libtool being detected
-	# Do not use this on Linux, fails with autoconf 2.69
-	export TARGET_HOST="asmjs-unknown-emscripten"
-fi
-
 install_lib_cmake $ZLIB_DIR $ZLIB_ARGS
 install_lib_cmake $LIBPNG_DIR $LIBPNG_ARGS
 install_lib_cmake $FREETYPE_DIR $FREETYPE_ARGS -DFT_DISABLE_HARFBUZZ=ON
@@ -116,13 +121,7 @@ install_lib_cmake $NLOHMANNJSON_DIR $NLOHMANNJSON_ARGS
 install_lib_meson $INIH_DIR $INIH_ARGS
 #install_lib $LHASA_DIR $LHASA_ARGS
 install_lib_cmake $FMT_DIR $FMT_ARGS
-
-# emscripten TARGET_HOST does not work for all libraries but SDL2 requires it
-export TARGET_HOST="asmjs-unknown-emscripten"
-rm -f config.cache
 install_lib $SDL2_DIR $SDL2_ARGS --disable-assembly --disable-threads --disable-cpuinfo
-rm -f config.cache
-unset TARGET_HOST
 
 install_lib_icu_cross
 icu_force_data_install