Skip to content

Commit

Permalink
fix: complete js build flags with ar
Browse files Browse the repository at this point in the history
  • Loading branch information
jaromil committed Aug 25, 2023
1 parent 6e49041 commit 2127a80
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ milagro:
cd ${pwd}/lib/milagro-crypto-c && \
mkdir -p build && \
cd build && \
CC=${gcc} LD=${ld} \
CC=${gcc} LD=${ld} AR=${ar} \
cmake ../ -DCMAKE_C_FLAGS="${cflags}" -DCMAKE_SYSTEM_NAME="${system}" \
-DCMAKE_AR=${ar} -DCMAKE_C_COMPILER=${gcc} ${milagro_cmake_flags}; \
fi
Expand All @@ -126,7 +126,7 @@ mimalloc:
cd ${pwd}/lib/mimalloc && \
mkdir -p build && \
cd build && \
CC=${gcc} LD=${ld} \
CC=${gcc} LD=${ld} AR=${AR} \
cmake ../ ${mimalloc_cmake_flags} \
-DCMAKE_C_FLAGS="${cflags} ${mimalloc_cflags}" \
-DCMAKE_SYSTEM_NAME="${system}" \
Expand Down
2 changes: 1 addition & 1 deletion build/javascript.mk
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ javascript-npm: ldflags += -s \
-s ALLOW_MEMORY_GROWTH=1 \
--no-heap-copy
javascript-npm: ${BUILDS}
CC="${gcc}" CFLAGS="${cflags}" LDFLAGS="${ldflags}" LDADD="${ldadd}" \
CC="${gcc}" AR="${ar}" CFLAGS="${cflags}" LDFLAGS="${ldflags}" LDADD="${ldadd}" \
JSEXT="--embed-file lua@/" \
make -C src js
@mkdir -p build/npm
Expand Down

0 comments on commit 2127a80

Please sign in to comment.