From b74c481afd282b070b6fde610933a8664bc25f84 Mon Sep 17 00:00:00 2001
From: Yiming Lei <yiming.lei@futurewei.com>
Date: Mon, 21 Dec 2020 12:31:27 -0800
Subject: [PATCH 1/2] make HOST_ARCH to be 32 under IS_JS2MPL_EXISTS 
 modified:   Makefile 	modified:   build/config/BUILDCONFIG.gn 
 modified:   mapleall/BUILD.gn

---
 Makefile                    | 4 +++-
 build/config/BUILDCONFIG.gn | 8 ++++++--
 mapleall/BUILD.gn           | 8 ++++----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 958d153..81142b0 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ NINJA := ${MAPLE_ROOT}/tools/ninja/ninja
 
 USE_CLANG_OP := 1
 HOST_ARCH_OP := 64
-JAVA_OP := 1
+JAVA_OP := 0
 USE_ZRT := 0
 DEFERRAL_RC := OFF
 STRICT_NAIVE_RC := OFF
@@ -48,6 +48,8 @@ else
 endif
 
 
+TARGET=vm
+
 GN_OPTIONS := \
   GN_INSTALL_PREFIX="$(MAPLE_ROOT)" \
   GN_BUILD_TYPE="$(BUILD_TYPE_OP)" \
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index b36b4e4..a05655a 100644
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn
@@ -17,6 +17,8 @@
 # declare here will be implicitly global.
 
 # List all the input args
+
+# Define global args
 declare_args() {
     GN_INSTALL_PREFIX = ""
     GN_BUILD_TYPE = ""
@@ -36,10 +38,12 @@ declare_args() {
     TARGET = ""
     USE_OJ_LIBCORE = 0
 }
-
-# Define global args
 MAPLE_ROOT = getenv("MAPLE_ROOT")
 IS_JS2MPL_EXISTS = getenv("IS_JS2MPL_EXISTS")
+if (IS_JS2MPL_EXISTS == "1") {
+  HOST_ARCH = 32
+  JAVA = 0
+}
 DYNAMICLANG = true
 RC_V2 = true
 if (X86_ARK == 1) {
diff --git a/mapleall/BUILD.gn b/mapleall/BUILD.gn
index 1f16e2e..476fecc 100644
--- a/mapleall/BUILD.gn
+++ b/mapleall/BUILD.gn
@@ -57,10 +57,10 @@ config("mapleallcompilecfg"){
     if(HOST_ARCH == 32){
 
         libs = [
-            "-lz",
-            "-lpthread",
-            "-ldl",
-            "-lelf",
+            "z",
+            "pthread",
+            "dl",
+            "elf",
         ]
 
         ldflags = []
-- 
Gitee


From 6918cdfe92eee83535fe2dbdf6ce855af1736fcb Mon Sep 17 00:00:00 2001
From: Yiming Lei <yiming.lei@futurewei.com>
Date: Mon, 21 Dec 2020 12:49:40 -0800
Subject: [PATCH 2/2] fix JAVA_OP of last patch 	modified:   Makefile 
 modified:   build/config/BUILDCONFIG.gn

---
 Makefile                    | 6 ++----
 build/config/BUILDCONFIG.gn | 2 ++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 81142b0..ba140ce 100644
--- a/Makefile
+++ b/Makefile
@@ -23,12 +23,12 @@ NINJA := ${MAPLE_ROOT}/tools/ninja/ninja
 
 USE_CLANG_OP := 1
 HOST_ARCH_OP := 64
-JAVA_OP := 0
+JAVA_OP := 1
 USE_ZRT := 0
 DEFERRAL_RC := OFF
 STRICT_NAIVE_RC := OFF
 RC_TESTING := OFF
-USE_MALLOC := 
+USE_MALLOC :=
 COV_CHECK := 0
 
 ifeq ($(TARGET_PROCESSOR), aarch64)
@@ -48,8 +48,6 @@ else
 endif
 
 
-TARGET=vm
-
 GN_OPTIONS := \
   GN_INSTALL_PREFIX="$(MAPLE_ROOT)" \
   GN_BUILD_TYPE="$(BUILD_TYPE_OP)" \
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index a05655a..a53f631 100644
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn
@@ -43,6 +43,8 @@ IS_JS2MPL_EXISTS = getenv("IS_JS2MPL_EXISTS")
 if (IS_JS2MPL_EXISTS == "1") {
   HOST_ARCH = 32
   JAVA = 0
+  TARGET = "vm"
+  JAVA_OP = 0
 }
 DYNAMICLANG = true
 RC_V2 = true
-- 
Gitee