diff options
| author | Angie Wang | 2017-01-26 12:28:03 -0800 |
|---|---|---|
| committer | GitHub | 2017-01-26 12:28:03 -0800 |
| commit | 4910be0b61f06f40d3f12a598e50bb4a61bc8690 (patch) | |
| tree | dd6a138c16ec10de2a32c3ab4b07a8bacf67ba49 | |
| parent | fa395b4c22f75d66047c1e835413beb612bc31d3 (diff) | |
doesn't lose old firrtl options annotations + transforms (#458)
Fixing a bug in passing down execution options to firrtl
| -rw-r--r-- | src/main/scala/chisel3/Driver.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/scala/chisel3/Driver.scala b/src/main/scala/chisel3/Driver.scala index c569a81b..8b05b159 100644 --- a/src/main/scala/chisel3/Driver.scala +++ b/src/main/scala/chisel3/Driver.scala @@ -256,8 +256,8 @@ object Driver extends BackendCompilationUtilities { /* This passes the firrtl source and annotations directly to firrtl */ optionsManager.firrtlOptions = optionsManager.firrtlOptions.copy( firrtlSource = Some(firrtlString), - annotations = circuit.annotations.toList, - customTransforms = transforms.toList) + annotations = optionsManager.firrtlOptions.annotations ++ circuit.annotations.toList, + customTransforms = optionsManager.firrtlOptions.customTransforms ++ transforms.toList) val firrtlExecutionResult = if(chiselOptions.runFirrtlCompiler) { Some(firrtl.Driver.execute(optionsManager)) |