remove cwabt

Kong · Apr 12, 2023 · a316b59 · a316b59
1 parent e7dafcd
commit a316b59
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 18 deletions.
diff --git a/t/10-build/003-dynamic_module.t b/t/10-build/003-dynamic_module.t
@@ -40,7 +40,7 @@ __DATA__
 
 === TEST 3: build as a dynamic module, with statically linked runtime - v8
 --- skip_eval: 4: $ENV{NGX_WASM_RUNTIME} ne 'v8' || $ENV{NGX_WASM_RUNTIME_DIR} eq '' || $ENV{NGX_WASM_RUNTIME} eq ''
---- build eval: qq{NGX_WASM_RUNTIME_INC="$ENV{NGX_WASM_RUNTIME_DIR}/include" NGX_WASM_RUNTIME_LIB="$ENV{NGX_WASM_RUNTIME_DIR}/lib" NGX_WASM_RUNTIME_LD_OPT="$ENV{NGX_WASM_RUNTIME_DIR}/lib/libwee8.a $ENV{NGX_WASM_RUNTIME_DIR}/lib/libv8bridge.a -lstdc++ -lm -ldl -lpthread" NGX_BUILD_DYNAMIC_MODULE=1 make }
+--- build eval: qq{NGX_WASM_RUNTIME_INC="$ENV{NGX_WASM_RUNTIME_DIR}/include" NGX_WASM_RUNTIME_LD_OPT="$ENV{NGX_WASM_RUNTIME_DIR}/lib/libwee8.a -L$ENV{NGX_WASM_RUNTIME_DIR}/lib -lv8bridge -lstdc++ -lm -ldl -lpthread" NGX_BUILD_DYNAMIC_MODULE=1 make}
 --- run_cmd eval: qq{find $::buildroot -name 'ngx_wasm_module.*' | xargs -I{} nm -g {}}
 --- grep_cmd eval
 [

diff --git a/util/runtimes/v8.sh b/util/runtimes/v8.sh
@@ -78,22 +78,6 @@ download_v8() {
 
 ###############################################################################
 
-build_cwabt() {
-    local target="$1"
-    local clean="$2"
-
-    notice "building lib/cwabt..."
-
-    cd $NGX_WASM_DIR/lib/cwabt
-
-    if [ "$clean" = "clean" ]; then
-        make clean
-    fi
-
-    make
-    make install TARGET="$target"
-}
-
 check_libwee8_build_dependencies() {
     python3 --help >/dev/null 2>/dev/null || {
         fatal "python3 is required in your path."
@@ -279,7 +263,6 @@ build_v8() {
     local arch="$3"
     local clean="$4"
 
-    build_cwabt "$target" "$clean"
     build_libwee8 "$target" "$clean" "$v8_ver" "$arch"
     build_v8bridge "$target" "$clean"
 }