Skip to content

Commit 181ac12

Browse files
committed
node path
1 parent 6316f8f commit 181ac12

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ do
148148
fi
149149
done
150150

151+
export SYS_NODE=$(echo -n $SDKROOT/emsdk/node/??.??.*/bin/node)
151152

152153
# this is python used for emsdk : ${SYS_PYTHON} -> ${EMSDK_PYTHON}
153154
# sane default

scripts/emsdk-fetch.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,14 +222,22 @@ END
222222

223223
curl -fsSL https://bun.sh/install | bash
224224

225+
export SYS_NODE=$(echo -n $SDKROOT/emsdk/node/??.??.*/bin/node)
226+
225227
# emsdk shipped node cannot run on alpine
226228
if [ -f /alpine ]
227229
then
228-
cp -vf /usr/bin/node $ROOT/emsdk/node/??.??.*/bin/node
230+
if [ -f $SYS_NODE.glibc ]
231+
then
232+
echo "node alpine node version already selected"
233+
else
234+
mv $SYS_NODE $SYS_NODE.glibc
235+
cp -vf /usr/bin/node $SYS_NODE
236+
fi
229237
fi
230238

231239
export PATH=$(echo -n ${SDKROOT}/emsdk/node/??.??.*/bin):$PATH
232-
$ROOT/emsdk/node/??.??.*/bin/npm install --prefix $ROOT/emsdk/node/??.??.* -g pnpm@^9.0.0
240+
$SDKROOT/emsdk/node/??.??.*/bin/npm install --prefix $SDKROOT/emsdk/node/??.??.* -g pnpm@^9.0.0
233241

234242
# maybe rewrite that in python and move it to emcc.py
235243

@@ -560,6 +568,7 @@ END
560568
[ -f $FIXED ] || cp $TRUE $FIXED
561569
done
562570

571+
export SYS_NODE=$(echo -n $SDKROOT/emsdk/node/??.??.*/bin/node)
563572

564573
export NPROC=1
565574
export EMSDK_NUM_CORES=$NPROC

0 commit comments

Comments
 (0)