Skip to content
This repository was archived by the owner on Nov 4, 2021. It is now read-only.

Commit 54fcf41

Browse files
committed
yosys: cleanup GHDL_LDLIBS
1 parent 247113d commit 54fcf41

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

scripts/compile_yosys.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,12 @@ then
2929
mkdir -p frontends/ghdl
3030
cp -R ../$dir_name_gyp/src/* frontends/ghdl
3131

32-
if [ $ARCH == "darwin" ]; then
33-
GHDL_LDLIBS="$PACKAGE_DIR/$NAME/lib/libghdl.a $(tr -s '\n' ' ' < $PACKAGE_DIR/$NAME/lib/libghdl.link)"
34-
elif [ ${ARCH:0:7} == "windows" ]; then
35-
GHDL_LDLIBS="$(cygpath -m -a $PACKAGE_DIR/$NAME/lib/libghdl.a) $(cat $PACKAGE_DIR/$NAME/lib/libghdl.link | tr -s '\n' ' ' | tr -s '\\' '/' )"
36-
else
37-
GHDL_LDLIBS="$PACKAGE_DIR/$NAME/lib/libghdl.a $(tr -s '\n' ' ' < $PACKAGE_DIR/$NAME/lib/libghdl.link)"
32+
if [ ${ARCH:0:7} == "windows" ]; then
33+
sed -i -e 's@.*\(/mingw.*\)@\1@' $PACKAGE_DIR/$NAME/lib/libghdl.link
34+
GHDL_LDLIBS="$PACKAGE_DIR/$NAME/lib/libghdl.a $(cat $PACKAGE_DIR/$NAME/lib/libghdl.link)"
3835
fi
36+
37+
GHDL_LDLIBS="$PACKAGE_DIR/$NAME/lib/libghdl.a $(cat $PACKAGE_DIR/$NAME/lib/libghdl.link)"
3938
fi
4039

4140
_ghdl_conf() {

0 commit comments

Comments
 (0)