Skip to content

Commit 445963c

Browse files
committed
3.1.72.0pre
1 parent a60a2c9 commit 445963c

File tree

5 files changed

+86
-11
lines changed

5 files changed

+86
-11
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818
build:
1919
runs-on: ubuntu-22.04
2020
env:
21-
BUILDS: 3.12
22-
EMFLAVOUR: latest
21+
BUILDS: 3.12 3.13
22+
EMFLAVOUR: tot
2323

2424
steps:
2525
- uses: actions/[email protected]

scripts/wasisdk-fetch.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pushd ${SDKROOT}
2828

2929
$HPIP install cmake wasmtime
3030

31-
mkdir -p ${SDKROOT}/wasisdk/share/cmake/Modules/Platform/
31+
mkdir -p ${WASISDK}/share/cmake/Modules/Platform/
3232

3333
cat > ${CMAKE_TOOLCHAIN_FILE} <<END
3434
# Cmake toolchain description file for the Makefile
@@ -140,12 +140,12 @@ END
140140

141141
pushd ${WASI_SYSROOT}
142142
VMLABS="https://github.com/vmware-labs/webassembly-language-runtimes/releases/download"
143-
wget "${VMLABS}/libs%2Flibpng%2F1.6.39%2B20230629-ccb4cb0/libpng-1.6.39-wasi-sdk-20.0.tar.gz" -O-| tar xfz -
144-
wget "${VMLABS}/libs%2Fzlib%2F1.2.13%2B20230623-2993864/libz-1.2.13-wasi-sdk-20.0.tar.gz" -O-| tar xfz -
145-
wget "${VMLABS}/libs%2Fsqlite%2F3.42.0%2B20230623-2993864/libsqlite-3.42.0-wasi-sdk-20.0.tar.gz" -O-| tar xfz -
146-
wget "${VMLABS}/libs%2Flibxml2%2F2.11.4%2B20230623-2993864/libxml2-2.11.4-wasi-sdk-20.0.tar.gz" -O-| tar xfz -
147-
wget "${VMLABS}/libs%2Fbzip2%2F1.0.8%2B20230623-2993864/libbzip2-1.0.8-wasi-sdk-20.0.tar.gz" -O-| tar xfz -
148-
wget "${VMLABS}/libs%2Flibuuid%2F1.0.3%2B20230623-2993864/libuuid-1.0.3-wasi-sdk-20.0.tar.gz" -O-| tar xfz -
143+
wget -q "${VMLABS}/libs%2Flibpng%2F1.6.39%2B20230629-ccb4cb0/libpng-1.6.39-wasi-sdk-20.0.tar.gz" -O-| tar xfz -
144+
wget -q "${VMLABS}/libs%2Fzlib%2F1.2.13%2B20230623-2993864/libz-1.2.13-wasi-sdk-20.0.tar.gz" -O-| tar xfz -
145+
wget -q "${VMLABS}/libs%2Fsqlite%2F3.42.0%2B20230623-2993864/libsqlite-3.42.0-wasi-sdk-20.0.tar.gz" -O-| tar xfz -
146+
wget -q "${VMLABS}/libs%2Flibxml2%2F2.11.4%2B20230623-2993864/libxml2-2.11.4-wasi-sdk-20.0.tar.gz" -O-| tar xfz -
147+
wget -q "${VMLABS}/libs%2Fbzip2%2F1.0.8%2B20230623-2993864/libbzip2-1.0.8-wasi-sdk-20.0.tar.gz" -O-| tar xfz -
148+
wget -q "${VMLABS}/libs%2Flibuuid%2F1.0.3%2B20230623-2993864/libuuid-1.0.3-wasi-sdk-20.0.tar.gz" -O-| tar xfz -
149149
popd
150150

151151
popd

wasisdk/bin/wasi

Lines changed: 71 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
#!/bin/bash
1+
#!/usr/bin/python3
22

33
# https://stackoverflow.com/questions/20530105/how-to-specify-a-custom-stdlib-directory-for-llvm
44
# https://stackoverflow.com/questions/60712261/how-to-prevent-osx-gcc-to-always-search-usr-local-include
55

6+
"""
67
if ${CONFIGURE:-false}
78
then
89
CXX_LIBS=
@@ -56,4 +57,73 @@ else
5657
$CC "${@}" ${WASI_LNK} -Wno-unused-function
5758
fi
5859
fi
60+
"""
61+
62+
63+
import sys
64+
import os
65+
from pathlib import Path
66+
67+
68+
def dbg(*argv, **kw):
69+
kw.setdefault("file", sys.stderr)
70+
return print(*argv, **kw)
71+
72+
SDKROOT = Path(os.environ.get("SDKROOT", "/opt/python-wasm-sdk"))
73+
WASISDK = Path(os.environ.get("WASISDK", "/opt/python-wasm-sdk/emsdk"))
74+
WASI_SDK_PREFIX=Path(os.environ.get("WASI_SDK_PREFIX", "/opt/python-wasm-sdk/wasisdk/upstream"))
75+
PREFIX = Path(os.environ.get("PREFIX", "/opt/python-wasm-sdk/devices/wasisdk/usr"))
76+
77+
dbg(sys.argv)
78+
exe = sys.argv.pop(0)
79+
80+
81+
if exe.endswith('c++'):
82+
mode = "++"
83+
args= ["clang++"]
84+
fixargs = True
85+
elif exe.endswith('cpp'):
86+
mode = "-cpp"
87+
args = ["clang-cpp"]
88+
args.extend(sys.argv)
89+
fixargs = False
90+
else:
91+
mode = ""
92+
args = ["clang"]
93+
fixargs = True
94+
95+
96+
if fixargs:
97+
args.extend( "-fPIC -fno-rtti -fno-exceptions -z stack-size=131072".split(' ') )
98+
99+
for arg in sys.argv:
100+
101+
if arg in ("-v", "--version"):
102+
dbg(*sys.argv)
103+
args=[exe]
104+
args.extend(sys.argv)
105+
break
106+
107+
if arg == '-Wl,--start-group':
108+
continue
109+
if arg == '-Wl,--end-group':
110+
continue
111+
112+
args.append(arg)
113+
else:
114+
115+
if 0:
116+
dbg("="*80)
117+
dbg(*sys.argv)
118+
dbg("="*80)
119+
dbg(*args)
120+
dbg("_"*80)
121+
122+
args.extend("-lwasi-emulated-getpid -lwasi-emulated-mman -lwasi-emulated-signal -lwasi-emulated-process-clocks".split(' '))
123+
args.extend("-D_GNU_SOURCE -D_WASI_EMULATED_MMAN -D_WASI_EMULATED_SIGNAL -D_WASI_EMULATED_PROCESS_CLOCKS -D_WASI_EMULATED_GETPID".split(' '))
124+
args.extend("-Wno-unknown-pragmas -Wno-unused-but-set-variable -Wno-unused-command-line-argument -Wno-unsupported-floating-point-opt -Wno-nullability-completeness".split(' '))
125+
126+
exe = f"{WASI_SDK_PREFIX}/bin/clang{mode}"
127+
#dbg(exe,len(args),*args)
128+
os.execv(exe, args)
59129

wasisdk/bin/wasi-cmake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ if . $SDKROOT/wasisdk/wasisdk_env.sh
44
then
55
CMAKE=$1
66
shift
7-
$CMAKE -DCMAKE_INSTALL_PREFIX=$PREFIX "$@"
7+
$CMAKE \
8+
-DCMAKE_SYSTEM_NAME=WASI \
9+
-DCMAKE_INSTALL_PREFIX=$PREFIX \
10+
"$@"
811
fi
912

wasisdk/wasisdk_env.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ then
1515
export WASI_SYSROOT="${WASI_SDK_PREFIX}/share/wasi-sysroot"
1616

1717
export CMAKE_TOOLCHAIN_FILE=${WASISDK}/share/cmake/Modules/Platform/WASI.cmake
18+
#export CMAKE_TOOLCHAIN_FILE=${WASI_SDK_DIR}/share/cmake/Platform/WASI.cmake
19+
1820
export CMAKE_INSTALL_PREFIX="${SDKROOT}/devices/${ARCH}/usr"
1921
export PREFIX=$CMAKE_INSTALL_PREFIX
2022

0 commit comments

Comments
 (0)