override VVP_EXECUTABLE from script

YosysHQ · May 16, 2022 · 0821e6f · 0821e6f
1 parent 409985f
commit 0821e6f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/default/scripts/iverilog.sh b/default/scripts/iverilog.sh
@@ -4,3 +4,5 @@ sh autoconf.sh
 make DESTDIR=${OUTPUT_DIR} -j${NPROC} install
 rm -rf ${OUTPUT_DIR}${INSTALL_PREFIX}/include
 rm -rf ${OUTPUT_DIR}${INSTALL_PREFIX}/lib/*.a
+sed -i -re 's|^flag:VVP_EXECUTABLE=.*$||g' ${OUTPUT_DIR}${INSTALL_PREFIX}/lib/ivl/vvp.conf
+sed -i -re 's|^flag:VVP_EXECUTABLE=.*$||g' ${OUTPUT_DIR}${INSTALL_PREFIX}/lib/ivl/vvp-s.conf
diff --git a/scripts/package-darwin.sh b/scripts/package-darwin.sh
@@ -37,8 +37,7 @@ EOT
         fi
         if [ ! -z "$(basename $binfile | grep iverilog)" ]; then
             cat >> $binfile << EOT
-sed -i 'bak' 's|^flag:VVP_EXECUTABLE=.*$|flag:VVP_EXECUTABLE=/usr/bin/env '\$release_topdir_abs'/bin/vvp|g' \$release_topdir_abs/lib/ivl/vvp.conf
-sed -i 'bak' 's|^flag:VVP_EXECUTABLE=.*$|flag:VVP_EXECUTABLE=/usr/bin/env '\$release_topdir_abs'/bin/vvp|g' \$release_topdir_abs/lib/ivl/vvp-s.conf
+set -- "-p" "VVP_EXECUTABLE=\$release_topdir_abs/bin/vvp" "\$@"
 EOT
         fi
         if [ ! -z "$(basename $binfile | grep ghdl)" ]; then

diff --git a/scripts/package-linux.sh b/scripts/package-linux.sh
@@ -51,8 +51,7 @@ EOT
         fi
         if [ ! -z "$(basename $binfile | grep iverilog)" ]; then
             cat >> $binfile << EOT
-sed -i -re 's|^flag:VVP_EXECUTABLE=.*$|flag:VVP_EXECUTABLE='\$release_topdir_abs'/bin/vvp|g' \$release_topdir_abs/lib/ivl/vvp.conf
-sed -i -re 's|^flag:VVP_EXECUTABLE=.*$|flag:VVP_EXECUTABLE='\$release_topdir_abs'/bin/vvp|g' \$release_topdir_abs/lib/ivl/vvp-s.conf
+set -- "-p" "VVP_EXECUTABLE=\$release_topdir_abs/bin/vvp" "\$@"
 EOT
         fi
         if [ ! -z "$(strings libexec/$(basename $binfile) | grep ghdl)" ]; then