Update libecc (#28)

nervosnetwork · Aug 16, 2023 · 135a6dc · 135a6dc
1 parent 7571829
commit 135a6dc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -9,8 +9,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-      with:
-        submodules: true
+    - run: git submodule update --init --recursive
 
     - name: Build contracts
       run: make all-via-docker

diff --git a/Makefile b/Makefile
@@ -15,12 +15,12 @@ PASSED_MBEDTLS_CFLAGS := -Os -fPIC -nostdinc -nostdlib -DCKB_DECLARATION_ONLY -I
 CFLAGS_BLST := -fno-builtin-printf -Ideps/blst/bindings $(subst ckb-c-stdlib,ckb-c-stdlib-202106,$(CFLAGS))
 CKB_VM_CLI := ckb-vm-b-cli
 
-CFLAGS_LIBECC := -fno-builtin -DUSER_NN_BIT_LEN=256 -DWORDSIZE=64 -DWITH_STDLIB -DWITH_BLANK_EXTERNAL_DEPENDENCIES -DCKB_DECLARATION_ONLY -fPIC -g -O3
+CFLAGS_LIBECC := -fno-builtin -DUSER_NN_BIT_LEN=256 -DWORDSIZE=64 -DWITH_CKB -DWITH_BLANK_EXTERNAL_DEPENDENCIES -DCKB_DECLARATION_ONLY -fPIC -g -O3 -I deps/ckb-c-stdlib -I deps/ckb-c-stdlib/libc
 
 LIBECC_OPTIMIZED_PATH := deps/libecc-riscv-optimized
 LIBECC_OPTIMIZED_FILES := ${LIBECC_OPTIMIZED_PATH}/build/libarith.a ${LIBECC_OPTIMIZED_PATH}/build/libec.a ${LIBECC_OPTIMIZED_PATH}/build/libsign.a
 CFLAGS_LIBECC_OPTIMIZED = $(CFLAGS_LIBECC) -DWITH_LL_U256_MONT
-CFLAGS_LINK_TO_LIBECC_OPTIMIZED := -fno-builtin -DWORDSIZE=64 -DWITH_STDLIB -DWITH_BLANK_EXTERNAL_DEPENDENCIES -fno-builtin-printf -I ${LIBECC_OPTIMIZED_PATH}/src -I ${LIBECC_OPTIMIZED_PATH}/src/external_deps
+CFLAGS_LINK_TO_LIBECC_OPTIMIZED := -fno-builtin -DWORDSIZE=64 -DWITH_CKB -DWITH_BLANK_EXTERNAL_DEPENDENCIES -fno-builtin-printf -I ${LIBECC_OPTIMIZED_PATH}/src -I ${LIBECC_OPTIMIZED_PATH}/src/external_deps
 
 MOLC := moleculec
 MOLC_VERSION := 0.7.0

diff --git a/deps/libecc-riscv-optimized b/deps/libecc-riscv-optimized