MAINT Update side modules to use SIDE_MODULE_LDFLAGS (#2650)

It causes trouble when these flags get out of sync, cf
WASM_BIGINT branch #2643
This commit is contained in:
Hood Chatham 2022-05-30 21:00:11 -07:00 committed by GitHub
parent 951681cfba
commit 6976ea69f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 10 deletions

View File

@ -34,6 +34,6 @@ build:
emmake make -j ${PYODIDE_JOBS:-3} blaslib lapacklib
mkdir -p dist/lib
emcc blas_WA.a lapack_WA.a F2CLIBS/libf2c.a -sSIDE_MODULE -o dist/lib/clapack_all.so
emcc blas_WA.a lapack_WA.a F2CLIBS/libf2c.a ${SIDE_MODULE_LDFLAGS} -o dist/lib/clapack_all.so
mkdir -p ${WASM_LIBRARY_DIR}/CLAPACK
cp -r INCLUDE ${WASM_LIBRARY_DIR}/CLAPACK/

View File

@ -7,8 +7,8 @@ source:
build:
sharedlibrary: true
script: |
em++ -c throw.cpp -o throw.o -fPIC -fexceptions -O2
em++ -c catch.cpp -o catch.o -fPIC -fexceptions -O2
em++ -c throw.cpp -o throw.o ${SIDE_MODULE_CFLAGS} -fexceptions
em++ -c catch.cpp -o catch.o ${SIDE_MODULE_CFLAGS} -fexceptions
mkdir dist
em++ throw.o -sSIDE_MODULE -o dist/cpp-exceptions-test-throw.so -fexceptions
em++ catch.o -sSIDE_MODULE -o dist/cpp-exceptions-test-catch.so -fexceptions
em++ throw.o ${SIDE_MODULE_LDFLAGS} -o dist/cpp-exceptions-test-throw.so -fexceptions
em++ catch.o ${SIDE_MODULE_LDFLAGS} -o dist/cpp-exceptions-test-catch.so -fexceptions

View File

@ -15,7 +15,7 @@ build:
-DHAVE_FORK=0 \
-DOPENSSL_NO_SECURE_MEMORY \
-DNO_SYSLOG \
-fPIC \
${SIDE_MODULE_CFLAGS} \
--prefix=${WASM_LIBRARY_DIR}
sed -i 's!^CROSS_COMPILE=.*!!g' Makefile
@ -24,6 +24,6 @@ build:
make -j ${PYODIDE_JOBS:-3} libssl.a
emar -d libcrypto.a liblegacy-lib-bn_asm.o liblegacy-lib-des_enc.o liblegacy-lib-fcrypt_b.o
mkdir dist
emcc -sSIDE_MODULE=1 libcrypto.a -o libcrypto.so
emcc -sSIDE_MODULE=1 libssl.a -o libssl.so
emcc ${SIDE_MODULE_LDFLAGS} libcrypto.a -o libcrypto.so
emcc ${SIDE_MODULE_LDFLAGS} libssl.a -o libssl.so
make install_sw

View File

@ -9,6 +9,6 @@ source:
build:
sharedlibrary: true
script: |
emcc -c main.c -o main.o -fPIC
emcc -c main.c -o main.o ${SIDE_MODULE_CFLAGS}
mkdir dist
emcc main.o -sSIDE_MODULE -o dist/sharedlib-test.so
emcc main.o ${SIDE_MODULE_LDFLAGS} -o dist/sharedlib-test.so