From 4910be0b61f06f40d3f12a598e50bb4a61bc8690 Mon Sep 17 00:00:00 2001
From: Angie Wang
Date: Thu, 26 Jan 2017 12:28:03 -0800
Subject: doesn't lose old firrtl options annotations + transforms (#458)

Fixing a bug in passing down execution options to firrtl---
 src/main/scala/chisel3/Driver.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

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))
-- 
cgit v1.2.3