diff options
| author | Martin Bahlinger <martin.bahlinger@leica-geosystems.com> | 2021-04-19 13:41:18 +0200 |
|---|---|---|
| committer | tgingold <tgingold@users.noreply.github.com> | 2021-04-20 18:58:15 +0200 |
| commit | 092025882ea6c3e4861277b175fa95e7825e756c (patch) | |
| tree | 2603a6039eeb4b18961554b93d5565d0427eba44 /scripts | |
| parent | d003498ad7c233826773cc17ffe75fd7ced2f945 (diff) | |
| download | ghdl-092025882ea6c3e4861277b175fa95e7825e756c.tar.gz ghdl-092025882ea6c3e4861277b175fa95e7825e756c.tar.bz2 ghdl-092025882ea6c3e4861277b175fa95e7825e756c.zip | |
Move --std= parameter before -frelaxed-rules
This is required for script to work also with ghdl > 0.37 and --std=08
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/vendors/compile-altera.ps1 | 2 | ||||
| -rw-r--r-- | scripts/vendors/compile-intel.ps1 | 2 | ||||
| -rw-r--r-- | scripts/vendors/compile-lattice.ps1 | 2 | ||||
| -rw-r--r-- | scripts/vendors/compile-osvvm.ps1 | 4 | ||||
| -rw-r--r-- | scripts/vendors/compile-uvvm.ps1 | 6 | ||||
| -rw-r--r-- | scripts/vendors/compile-xilinx-ise.ps1 | 2 | ||||
| -rw-r--r-- | scripts/vendors/compile-xilinx-vivado.ps1 | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/scripts/vendors/compile-altera.ps1 b/scripts/vendors/compile-altera.ps1 index 76f47b1c4..2ca3116fc 100644 --- a/scripts/vendors/compile-altera.ps1 +++ b/scripts/vendors/compile-altera.ps1 @@ -151,6 +151,7 @@ $VHDLVersion,$VHDLStandard,$VHDLFlavor = Get-VHDLVariables $VHDL93 $VHDL2008 # define global GHDL Options $Analyze_Parameters = @( + "--std=$VHDLStandard", "-fexplicit", "-frelaxed-rules", "--mb-comments", @@ -171,7 +172,6 @@ if (-not ($EnableVerbose -or $EnableDebug)) $Analyze_Parameters += @( "--ieee=$VHDLFlavor", "--no-vital-checks", - "--std=$VHDLStandard", "-P$DestinationDirectory" ) diff --git a/scripts/vendors/compile-intel.ps1 b/scripts/vendors/compile-intel.ps1 index e554f292d..c6b5dfedc 100644 --- a/scripts/vendors/compile-intel.ps1 +++ b/scripts/vendors/compile-intel.ps1 @@ -151,6 +151,7 @@ $VHDLVersion,$VHDLStandard,$VHDLFlavor = Get-VHDLVariables $VHDL93 $VHDL2008 # define global GHDL Options $Analyze_Parameters = @( + "--std=$VHDLStandard", "-fexplicit", "-frelaxed-rules", "--mb-comments", @@ -171,7 +172,6 @@ if (-not ($EnableVerbose -or $EnableDebug)) $Analyze_Parameters += @( "--ieee=$VHDLFlavor", "--no-vital-checks", - "--std=$VHDLStandard", "-P$DestinationDirectory" ) diff --git a/scripts/vendors/compile-lattice.ps1 b/scripts/vendors/compile-lattice.ps1 index ef8d1b59a..873af8880 100644 --- a/scripts/vendors/compile-lattice.ps1 +++ b/scripts/vendors/compile-lattice.ps1 @@ -178,6 +178,7 @@ $VHDLVersion,$VHDLStandard,$VHDLFlavor = Get-VHDLVariables $VHDL93 $VHDL2008 # define global GHDL Options $Analyze_Parameters = @( + "--std=$VHDLStandard", "-fexplicit", "-frelaxed-rules", "--mb-comments", @@ -198,7 +199,6 @@ if (-not ($EnableVerbose -or $EnableDebug)) $Analyze_Parameters += @( "--ieee=$VHDLFlavor", "--no-vital-checks", - "--std=$VHDLStandard", "-P$DestinationDirectory" ) diff --git a/scripts/vendors/compile-osvvm.ps1 b/scripts/vendors/compile-osvvm.ps1 index 318d8bdaf..d93ca2d1d 100644 --- a/scripts/vendors/compile-osvvm.ps1 +++ b/scripts/vendors/compile-osvvm.ps1 @@ -116,10 +116,11 @@ $VHDLVersion,$VHDLStandard,$VHDLFlavor = Get-VHDLVariables -VHDL2008 # define global GHDL Options
$Analyze_Parameters = @(
+ "--std=$VHDLStandard",
"-fexplicit",
"-frelaxed-rules",
"--mb-comments",
- "-Wbinding"
+ "-Wbinding"
)
if (-not $EnableDebug)
{ $Analyze_Parameters += @(
@@ -135,7 +136,6 @@ if (-not ($EnableVerbose -or $EnableDebug)) $Analyze_Parameters += @(
"--ieee=$VHDLFlavor",
"--no-vital-checks",
- "--std=$VHDLStandard",
"-P$DestinationDirectory"
)
diff --git a/scripts/vendors/compile-uvvm.ps1 b/scripts/vendors/compile-uvvm.ps1 index fefd755a6..ddd4919b7 100644 --- a/scripts/vendors/compile-uvvm.ps1 +++ b/scripts/vendors/compile-uvvm.ps1 @@ -168,9 +168,11 @@ $VHDLVersion,$VHDLStandard,$VHDLFlavor = Get-VHDLVariables # define global GHDL Options $Analyze_Parameters = @( + "--std=$VHDLStandard", + "-fexplicit", + "-frelaxed-rules", "--mb-comments", "-Wbinding", - "-fexplicit", "-Wno-shared" # UVVM specific ) if (-not $EnableDebug) @@ -187,8 +189,6 @@ if (-not ($EnableVerbose -or $EnableDebug)) $Analyze_Parameters += @( "--ieee=$VHDLFlavor", "--no-vital-checks", - "--std=$VHDLStandard", - "-frelaxed", "-P$DestinationDirectory" ) diff --git a/scripts/vendors/compile-xilinx-ise.ps1 b/scripts/vendors/compile-xilinx-ise.ps1 index 5c51f8f25..cec4c6cf0 100644 --- a/scripts/vendors/compile-xilinx-ise.ps1 +++ b/scripts/vendors/compile-xilinx-ise.ps1 @@ -144,6 +144,7 @@ $VHDLVersion,$VHDLStandard,$VHDLFlavor = Get-VHDLVariables $VHDL93 $VHDL2008 # define global GHDL Options $Analyze_Parameters = @( + "--std=$VHDLStandard", "-fexplicit", "-frelaxed-rules", "--mb-comments", @@ -164,7 +165,6 @@ if (-not ($EnableVerbose -or $EnableDebug)) $Analyze_Parameters += @( "--ieee=$VHDLFlavor", "--no-vital-checks", - "--std=$VHDLStandard", "-P$DestinationDirectory" ) diff --git a/scripts/vendors/compile-xilinx-vivado.ps1 b/scripts/vendors/compile-xilinx-vivado.ps1 index d0fb0698a..f336a8994 100644 --- a/scripts/vendors/compile-xilinx-vivado.ps1 +++ b/scripts/vendors/compile-xilinx-vivado.ps1 @@ -135,6 +135,7 @@ $VHDLVersion,$VHDLStandard,$VHDLFlavor = Get-VHDLVariables $VHDL93 $VHDL2008 # define global GHDL Options $Analyze_Parameters = @( + "--std=$VHDLStandard", "-fexplicit", "-frelaxed-rules", "--mb-comments", @@ -155,7 +156,6 @@ if (-not ($EnableVerbose -or $EnableDebug)) $Analyze_Parameters += @( "--ieee=$VHDLFlavor", "--no-vital-checks", - "--std=$VHDLStandard", "-P$DestinationDirectory" ) |