diff options
author | Patrick Lehmann <Patrick.Lehmann@tu-dresden.de> | 2016-11-10 19:49:11 +0100 |
---|---|---|
committer | Patrick Lehmann <Patrick.Lehmann@tu-dresden.de> | 2016-11-10 19:49:11 +0100 |
commit | 6904a5ac645bacf910b4e771fcb2983215b9c69f (patch) | |
tree | 6b97e912b7b8474bd935723b11f8db7e9eb654b6 /libraries/vendors/compile-xilinx-ise.sh | |
parent | f903ccc342e1448b38c83dfd7322b28f6121c111 (diff) | |
download | ghdl-6904a5ac645bacf910b4e771fcb2983215b9c69f.tar.gz ghdl-6904a5ac645bacf910b4e771fcb2983215b9c69f.tar.bz2 ghdl-6904a5ac645bacf910b4e771fcb2983215b9c69f.zip |
Fixed bugs in compile-xilinx-***.sh files. Added support for the unifast library in Vivado.
Diffstat (limited to 'libraries/vendors/compile-xilinx-ise.sh')
-rwxr-xr-x | libraries/vendors/compile-xilinx-ise.sh | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/libraries/vendors/compile-xilinx-ise.sh b/libraries/vendors/compile-xilinx-ise.sh index 25716aaf7..efe361b34 100755 --- a/libraries/vendors/compile-xilinx-ise.sh +++ b/libraries/vendors/compile-xilinx-ise.sh @@ -276,7 +276,10 @@ fi # compile unisim primitives if [ $STOPCOMPILING -eq 0 ] && [ "$COMPILE_UNISIM" == "TRUE" ]; then Library="unisim" - SourceFiles="$(LC_COLLATE=C ls $SourceDirectory/${Library}s/primitive/*.vhd)" + SourceFiles=() + while IFS= read -r File; do + SourceFiles+=("$SourceDirectory/${Library}s/primitive/$File") + done < <(grep --no-filename -R '^[a-zA-Z]' "$SourceDirectory/${Library}s/primitive/vhdl_analyze_order") GHDLCompileLibrary fi @@ -284,7 +287,10 @@ fi # compile unisim secureip primitives if [ $STOPCOMPILING -eq 0 ] && [ "$COMPILE_UNISIM" == "TRUE" ] && [ "$COMPILE_SECUREIP" == "TRUE" ]; then Library="secureip" - SourceFiles="$(LC_COLLATE=C ls $SourceDirectory/unisims/$Library/*.vhd)" + SourceFiles=() + while IFS= read -r File; do + SourceFiles+=("$SourceDirectory/unisims/$Library/$File") + done < <(grep --no-filename -R '^[a-zA-Z]' "$SourceDirectory/unisims/$Library/vhdl_analyze_order") GHDLCompileLibrary fi @@ -309,7 +315,7 @@ fi # compile unimacro macros if [ $STOPCOMPILING -eq 0 ] && [ "$COMPILE_UNIMACRO" == "TRUE" ]; then Library="unimacro" - SourceFiles="$(LC_COLLATE=C ls $SourceDirectory/$Library/*_MACRO.vhd)" + SourceFiles=($(LC_COLLATE=C ls $SourceDirectory/$Library/*_MACRO.vhd)) GHDLCompileLibrary fi @@ -335,7 +341,10 @@ fi # compile simprim primitives if [ $STOPCOMPILING -eq 0 ] && [ "$COMPILE_SIMPRIM" == "TRUE" ]; then Library="simprim" - SourceFiles="$(LC_COLLATE=C ls $SourceDirectory/${Library}s/primitive/other/*.vhd)" + SourceFiles=() + while IFS= read -r File; do + SourceFiles+=("$SourceDirectory/${Library}s/primitive/other/$File") + done < <(grep --no-filename -R '^[a-zA-Z]' "$SourceDirectory/${Library}s/primitive/other/vhdl_analyze_order") GHDLCompileLibrary fi @@ -343,7 +352,10 @@ fi # compile simprim secureip primitives if [ $STOPCOMPILING -eq 0 ] && [ "$COMPILE_SIMPRIM" == "TRUE" ] && [ "$COMPILE_SECUREIP" == "TRUE" ]; then Library="secureip" - SourceFiles="$(LC_COLLATE=C ls $SourceDirectory/simprims/$Library/other/*.vhd)" + SourceFiles=() + while IFS= read -r File; do + SourceFiles+=("$SourceDirectory/simprims/$Library/other/$File") + done < <(grep --no-filename -R '^[a-zA-Z]' "$SourceDirectory/simprims/$Library/other/vhdl_analyze_order") GHDLCompileLibrary fi |