Skip to content

Commit a9e218f

Browse files
committed
Use argv[0] instead of PYTHONEXECUTABLE
1 parent 708d01f commit a9e218f

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

scripts/package-linux.sh

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,6 @@ release_topdir_abs="\$(readlink -f "\$release_bindir/$rel_path")"
3838
export PATH="\$release_bindir_abs:\$PATH"
3939
EOT
4040

41-
if [ $bindir == 'py3bin' ]; then
42-
cat >> $binfile << EOT
43-
export PYTHONEXECUTABLE="\$release_topdir_abs/bin/tabbypy3"
44-
EOT
45-
fi
4641
if [ ! -z "$(basename $binfile | grep verilator)" ]; then
4742
cat >> $binfile << EOT
4843
export VERILATOR_ROOT="\$release_topdir_abs/share/verilator"
@@ -60,7 +55,6 @@ EOT
6055
fi
6156
if [ ! -z "$(basename $binfile | grep vvp)" ]; then
6257
cat >> $binfile << EOT
63-
export PYTHONEXECUTABLE="\$release_topdir_abs/bin/tabbypy3"
6458
export PYTHONHOME="\$release_topdir_abs"
6559
EOT
6660
fi
@@ -146,14 +140,14 @@ if [ ${PRELOAD} == 'True' ]; then
146140
echo "Skipping"
147141
else
148142
cat >> $binfile << EOT
149-
exec "\$release_topdir_abs"/lib/$ldlinuxname --inhibit-cache --inhibit-rpath "" --library-path "\$release_topdir_abs"/lib --preload "\$release_topdir_abs"/lib/preload.o "\$release_topdir_abs"/libexec/$(basename $binfile) "\$@"
143+
exec "\$release_topdir_abs"/lib/$ldlinuxname --inhibit-cache --inhibit-rpath "" --library-path "\$release_topdir_abs"/lib --preload "\$release_topdir_abs"/lib/preload.o --argv0 "\$0" "\$release_topdir_abs"/libexec/$(basename $binfile) "\$@"
150144
EOT
151145
chmod +x $binfile
152146
continue
153147
fi
154148
fi
155149
cat >> $binfile << EOT
156-
exec "\$release_topdir_abs"/lib/$ldlinuxname --inhibit-cache --inhibit-rpath "" --library-path "\$release_topdir_abs"/lib "\$release_topdir_abs"/libexec/$(basename $binfile) "\$@"
150+
exec "\$release_topdir_abs"/lib/$ldlinuxname --inhibit-cache --inhibit-rpath "" --library-path "\$release_topdir_abs"/lib --argv0 "\$0" "\$release_topdir_abs"/libexec/$(basename $binfile) "\$@"
157151
EOT
158152
chmod +x $binfile
159153
done
@@ -175,7 +169,6 @@ release_bindir="\$(dirname "\${BASH_SOURCE[0]}")"
175169
release_bindir_abs="\$(readlink -f "\$release_bindir/../bin")"
176170
release_topdir_abs="\$(readlink -f "\$release_bindir/$rel_path")"
177171
export PATH="\$release_bindir_abs:\$PATH"
178-
export PYTHONEXECUTABLE="\$release_bindir_abs/tabbypy3"
179172
EOT
180173
is_using_fonts=false
181174
if [ $script == 'bin/xdot' ]; then

0 commit comments

Comments
 (0)