From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Mon, 1 Sep 2014 21:55:46 +0000 (-0500)
Subject: build opts: add MI_example to NULL ISA
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=00286fc5cbb7b8635d56eb335fed11d1499e2552;p=gem5.git

build opts: add MI_example to NULL ISA
A later changeset changes the file src/python/swig/pyobject.cc to include
a header file that includes a header file generated at build time depending
on the PROTOCOL in use.  Since NULL ISA was not specifying any protocol,
this resulted in compilation problems.  Hence, the changeset.
---

diff --git a/build_opts/NULL b/build_opts/NULL
index 5d85833f3..1242fa9ef 100644
--- a/build_opts/NULL
+++ b/build_opts/NULL
@@ -1,2 +1,3 @@
 TARGET_ISA = 'null'
 CPU_MODELS = ''
+PROTOCOL='MI_example'
diff --git a/src/mem/ruby/SConscript b/src/mem/ruby/SConscript
index 3029c3297..4200ddaeb 100644
--- a/src/mem/ruby/SConscript
+++ b/src/mem/ruby/SConscript
@@ -59,9 +59,6 @@ CompoundFlag('Ruby', [ 'RubyQueue', 'RubyNetwork', 'RubyTester',
     'RubyMemory', 'RubyDma', 'RubyPort', 'RubySequencer', 'RubyCacheTrace',
     'RubyPrefetcher'])
 
-if env['TARGET_ISA'] == 'null':
-    Return()
-
 if env['PROTOCOL'] == 'None':
     Return()