fixing wrong compiler

Author: DanielZlotin

scripts/compile/all.sh

@@ -1,7 +1,6 @@
 #!/bin/bash -e
 
 SCRIPT_DIR=$(cd `dirname $0`; pwd)
-export ANDROID_API=21
 
 compile_arch() {
   echo -e '\033]2;'"compiling toolchain for $JSC_ARCH $FLAVOR"'\007'

scripts/compile/jsc.sh

@@ -27,6 +27,20 @@ $JSC_LDFLAGS \
 $PLATFORM_LDFLAGS \
 "
 
+export AR=$CROSS_COMPILE_PLATFORM-ar
+export AS=$CROSS_COMPILE_PLATFORM-clang
+export CC=$CROSS_COMPILE_PLATFORM-clang
+export CXX=$CROSS_COMPILE_PLATFORM-clang++
+export LD=$CROSS_COMPILE_PLATFORM-ld
+export STRIP=$CROSS_COMPILE_PLATFORM-strip
+
+ARCH_NAME_PLATFORM_arm="arm"
+ARCH_NAME_PLATFORM_arm64="aarch64"
+ARCH_NAME_PLATFORM_x86="i686"
+ARCH_NAME_PLATFORM_x86_64="x86_64"
+var="ARCH_NAME_PLATFORM_$JSC_ARCH"
+export ARCH_NAME=${!var}
+
 $TARGETDIR/webkit/Tools/Scripts/build-webkit \
   --jsc-only \
   --release \
@@ -39,7 +53,7 @@ $TARGETDIR/webkit/Tools/Scripts/build-webkit \
   --cmakeargs="-DCMAKE_SYSTEM_NAME=Android \
   $SWITCH_BUILD_WEBKIT_CMAKE_ARGS_COMPAT \
   -DCMAKE_SYSTEM_VERSION=$ANDROID_API \
-  -DCMAKE_SYSTEM_PROCESSOR=$ARCH \
+  -DCMAKE_SYSTEM_PROCESSOR=$ARCH_NAME \
   -DCMAKE_ANDROID_STANDALONE_TOOLCHAIN=$TOOLCHAIN_DIR \
   -DWEBKIT_LIBRARIES_INCLUDE_DIR=$TARGETDIR/icu/source/common \
   -DWEBKIT_LIBRARIES_LINK_DIR=$TARGETDIR/icu/${CROSS_COMPILE_PLATFORM}-${FLAVOR}/lib \

scripts/start.sh

@@ -1,8 +1,9 @@
 #!/bin/bash -e
 
-ROOTDIR=$PWD
-TARGETDIR=$ROOTDIR/build/target
-REVISION=$(svn info --show-item last-changed-revision "https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-${npm_package_config_webkitGTK}")
+export ANDROID_API=21
+export ROOTDIR=$PWD
+export TARGETDIR=$ROOTDIR/build/target
+export REVISION=$(svn info --show-item last-changed-revision "https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-${npm_package_config_webkitGTK}")
 
 prep() {
   echo -e '\033]2;'prep'\007'