Skip to content

Commit 7577fac

Browse files
committed
3.1.70.11
1 parent 1292eb6 commit 7577fac

File tree

2 files changed

+12
-23
lines changed

2 files changed

+12
-23
lines changed

config

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,6 @@ export HPIP="${HPY} -mpip"
3737
export CPOPTS="-Os -g0 -fPIC"
3838

3939

40-
if [ -f ${ROOT}/dev ]
41-
then
42-
export COPTS="-fPIC"
43-
export QUIET=""
44-
else
45-
export COPTS="-fPIC"
46-
if ${VERBOSE:-false}
47-
then
48-
export QUIET=""
49-
else
50-
export QUIET="2>&1 > $PYTHONPYCACHEPREFIX/.log"
51-
fi
52-
fi
53-
5440
# base wasm features pure is "mvp" , "bi" is bigint
5541

5642
if [ -f /mvp ]

emsdk-cc

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ else:
122122
# try to keep 32 but maybe with 64 iface (bigint)
123123
WASM_EXTRA = env("WASM_EXTRA", "") + " " + env("WASM_OPTS", "")
124124

125-
COPTS = env("COPTS", "-O1")
126-
125+
# the only sane default for now
126+
COPTS = env("COPTS", "-O2 -g3")
127127

128128
MAIN_MODULE = LINKING = STATIC = False
129129

@@ -145,6 +145,9 @@ out = []
145145

146146
# fix rust calling
147147
for argc, arg in enumerate(sys.argv):
148+
149+
# clean up rustc way of passing args.
150+
148151
if arg in ("-l", "-L", "-I"):
149152
sys.argv[argc] += sys.argv[argc + 1]
150153
sys.argv[argc + 1] = ""
@@ -176,6 +179,13 @@ for argc, arg in enumerate(sys.argv):
176179
SKIP = True
177180
break
178181

182+
# THEY ARE NOT SAFE TO CHANGE !
183+
if arg in ("-O0", "-O1", "-O2", "-O3", "-Os", "-Oz"):
184+
continue
185+
if arg in ("-g0", "-g1", "-g2", "-g3", "-g4"):
186+
continue
187+
188+
179189
if not MAIN_MODULE:
180190
# https://github.com/emscripten-core/emscripten/issues/22742
181191
# https://github.com/hoodmane/emscripten/commit/34144634026c91a73bd3e1db85627132d3a37a6d
@@ -199,13 +209,6 @@ for argc, arg in enumerate(sys.argv):
199209
if MVP:
200210
continue
201211

202-
if arg in ("-O0", "-O1", "-O2", "-O3", "-Os", "-Oz"):
203-
continue
204-
205-
# keep g3
206-
if arg in ("-g0", "-g1", "-g2", "-g4"):
207-
continue
208-
209212
# FAILSAFE
210213
# that is for some very bad known setup.py behaviour regarding cross compiling and some old codebases.
211214
# should not be needed ..

0 commit comments

Comments
 (0)