diff --git a/Makefile b/Makefile index 958d153d24044fc76eb955f6b70e1cff6ab01a8d..ba140ce914dd9b4bdb1f30a3a99f5c3cb2986c6b 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ USE_ZRT := 0 DEFERRAL_RC := OFF STRICT_NAIVE_RC := OFF RC_TESTING := OFF -USE_MALLOC := +USE_MALLOC := COV_CHECK := 0 ifeq ($(TARGET_PROCESSOR), aarch64) diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn index b36b4e4e8330fd77c885c1c5d1e06f5965075666..a53f63197833169acda79c04a91a8c39e039db66 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,14 @@ 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 + TARGET = "vm" + JAVA_OP = 0 +} DYNAMICLANG = true RC_V2 = true if (X86_ARK == 1) { diff --git a/mapleall/BUILD.gn b/mapleall/BUILD.gn index 1f16e2ef9f323c7d09f81a1b7d2ed65c85d3c2e5..476fecc7e6166f3b9b31f8dc9772b2342630a07e 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 = []