Skip to content

Commit dd6d75d

Browse files
committed
better shared support
1 parent b6d58be commit dd6d75d

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ jobs:
4646
bash -c "./python-wasm-sdk.sh"
4747
4848
- name: Upload sdk to Github artifacts
49-
uses: actions/upload-artifact@v2
49+
uses: actions/upload-artifact@v3.1.1
5050
with:
5151
path: /tmp/sdk
5252

5353
- name: Upload sdk to Github Releases
5454
if: github.event_name == 'release'
55-
uses: svenstaro/upload-release-action@2.2.1
55+
uses: svenstaro/upload-release-action@2.3.0
5656
with:
5757
repo_token: ${{ secrets.GITHUB_TOKEN }}
5858
file: /tmp/sdk/*

python-wasm-sdk.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,11 @@ do
2929

3030
if [ -f ${SDKROOT}/dev ]
3131
then
32-
rm ${SDKROOT}/emsdk/.completed
32+
rm ${SDKROOT}/emsdk/.complete
3333
else
3434
rm -rf ${SDKROOT}/*
3535
fi
3636

37-
3837
cp -Rf * ${SDKROOT}/
3938

4039
if cd ${SDKROOT}/

scripts/emsdk-fetch.sh

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ then
1313
" 1>&2
1414
else
1515
# emsdk could have been deleted for full rebuild
16-
rm emsdk/.completed
16+
rm emsdk/.complete
1717

1818
if git clone --no-tags --depth 1 --single-branch --branch main https://github.com/emscripten-core/emsdk.git
1919
then
@@ -48,7 +48,7 @@ then
4848

4949
export EMSDK_PYTHON=$SYS_PYTHON
5050

51-
if [ -f emsdk/.completed ]
51+
if [ -f emsdk/.complete ]
5252
then
5353
echo "
5454
* emsdk prereq ok
@@ -151,10 +151,11 @@ for arg do
151151
else
152152
if \$IS_SHARED
153153
then
154-
if echo "$arg"|grep -q -F .so\$
154+
if echo "\$arg"|grep -q -F .so
155155
then
156156
PY_MODULE=true
157-
SHARED_TARGET=$arg
157+
SHARED_TARGET=\$arg
158+
SHARED="-sSIDE_MODULE"
158159
fi
159160
fi
160161
fi
@@ -200,10 +201,13 @@ $EMSDK_PYTHON -E \$0.py "\$@"
200201
END
201202

202203
chmod +x emsdk/upstream/emscripten/em*
203-
touch emsdk/.completed
204+
touch emsdk/.complete
204205
sync
205206
fi
206207

208+
# EM_PKG_CONFIG_PATH ?
209+
# https://emscripten.org/docs/compiling/Building-Projects.html#pkg-config
210+
207211
export PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig"
208212

209213
if echo $PATH|grep -q $EMSDK/upstream/emscripten/system/bin

0 commit comments

Comments
 (0)