[debugger] Use correct archiver

This will allow usage of emscripten 1.39.6 to build

Change-Id: I089f47fa4fa38bf55c5071f5d711856c8ab422b8
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/267080
Reviewed-by: Kevin Lubick <kjlubick@google.com>
This commit is contained in:
Kevin Lubick 2020-01-28 14:50:52 -05:00
parent 6d54a1e5f0
commit 0f4cb09320

View File

@ -20,6 +20,7 @@ pushd $BASE_DIR/../..
source $EMSDK/emsdk_env.sh source $EMSDK/emsdk_env.sh
EMCC=`which emcc` EMCC=`which emcc`
EMCXX=`which em++` EMCXX=`which em++`
EMAR=`which emar`
if [[ $@ == *debug* ]]; then if [[ $@ == *debug* ]]; then
echo "Building a Debug build" echo "Building a Debug build"
@ -65,6 +66,7 @@ echo "Compiling bitcode"
./bin/gn gen ${BUILD_DIR} \ ./bin/gn gen ${BUILD_DIR} \
--args="cc=\"${EMCC}\" \ --args="cc=\"${EMCC}\" \
cxx=\"${EMCXX}\" \ cxx=\"${EMCXX}\" \
ar=\"${EMAR}\" \
extra_cflags_cc=[\"-frtti\"] \ extra_cflags_cc=[\"-frtti\"] \
extra_cflags=[\"-s\", \"WARN_UNALIGNED=1\", \"-s\", \"MAIN_MODULE=1\", extra_cflags=[\"-s\", \"WARN_UNALIGNED=1\", \"-s\", \"MAIN_MODULE=1\",
\"-DSKNX_NO_SIMD\", \"-DSK_DISABLE_AAA\", \"-DSKNX_NO_SIMD\", \"-DSK_DISABLE_AAA\",