Skip to content

Commit 475816a

Browse files
committed
Use argv[0] instead of PYTHONEXECUTABLE
1 parent 474f60b commit 475816a

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
@@ -44,11 +44,6 @@ release_topdir_abs="\$(readlink -f "\$release_bindir/$rel_path")"
4444
export PATH="\$release_bindir_abs:\$PATH"
4545
EOT
4646

47-
if [ $bindir == 'py3bin' ]; then
48-
cat >> $binfile << EOT
49-
export PYTHONEXECUTABLE="\$release_topdir_abs/bin/tabbypy3"
50-
EOT
51-
fi
5247
if [ ! -z "$(basename $binfile | grep verilator)" ]; then
5348
cat >> $binfile << EOT
5449
export VERILATOR_ROOT="\$release_topdir_abs/share/verilator"
@@ -66,7 +61,6 @@ EOT
6661
fi
6762
if [ ! -z "$(basename $binfile | grep vvp)" ]; then
6863
cat >> $binfile << EOT
69-
export PYTHONEXECUTABLE="\$release_topdir_abs/bin/tabbypy3"
7064
export PYTHONHOME="\$release_topdir_abs"
7165
EOT
7266
fi
@@ -169,7 +163,7 @@ done
169163
if [ ${PRELOAD} == 'True' ]; then
170164
if $found; then
171165
cat >> $binfile << EOT
172-
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) "\$@"
166+
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) "\$@"
173167
EOT
174168
chmod +x $binfile
175169
continue
@@ -178,7 +172,7 @@ EOT
178172
fi
179173
fi
180174
cat >> $binfile << EOT
181-
exec "\$release_topdir_abs"/lib/$ldlinuxname --inhibit-cache --inhibit-rpath "" --library-path "\$release_topdir_abs"/lib "\$release_topdir_abs"/libexec/$(basename $binfile) "\$@"
175+
exec "\$release_topdir_abs"/lib/$ldlinuxname --inhibit-cache --inhibit-rpath "" --library-path "\$release_topdir_abs"/lib --argv0 "\$0" "\$release_topdir_abs"/libexec/$(basename $binfile) "\$@"
182176
EOT
183177
chmod +x $binfile
184178
done
@@ -200,7 +194,6 @@ release_bindir="\$(dirname "\${BASH_SOURCE[0]}")"
200194
release_bindir_abs="\$(readlink -f "\$release_bindir/../bin")"
201195
release_topdir_abs="\$(readlink -f "\$release_bindir/$rel_path")"
202196
export PATH="\$release_bindir_abs:\$PATH"
203-
export PYTHONEXECUTABLE="\$release_bindir_abs/tabbypy3"
204197
EOT
205198
is_using_fonts=false
206199
if [ $script == 'bin/xdot' ]; then

0 commit comments

Comments
 (0)