From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Wed, 4 Aug 2004 05:46:03 +0000 (-0700)
Subject: Move libelf/SConscript include to m5/SConscript, so elf
X-Git-Tag: m5_1.0_tutorial~198^2~5
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1939370c96b48a1f635799b6017d5f5f11799353;p=gem5.git

Move libelf/SConscript include to m5/SConscript, so elf
headers get created in build tree (under build/FOO/libelf)
instead of source tree (m5/libelf).

SConscript:
    Move libelf/SConscript include here.
build/SConstruct:
    Get rid of libelf/SConscript include (moved to
    m5/SConscript).

--HG--
extra : convert_revision : c0acb3bab2afa5079748b907c5917f548582099e
---

diff --git a/SConscript b/SConscript
index 60e703e9b..cd41c3143 100644
--- a/SConscript
+++ b/SConscript
@@ -337,6 +337,11 @@ def link_targetarch(target, source, env):
 env.Command('targetarch', None, link_targetarch)
 
 
+# libelf build is described in its own SConscript file.
+SConscript('libelf/SConscript', exports = 'env',
+           duplicate=0)
+
+
 # This function adds the specified sources to the given build
 # environment, and returns a list of all the corresponding SCons
 # Object nodes (including an extra one for date.cc).  We explicitly
diff --git a/build/SConstruct b/build/SConstruct
index d6d723c95..08eb13ea1 100644
--- a/build/SConstruct
+++ b/build/SConstruct
@@ -246,12 +246,6 @@ default_env.Append(CCFLAGS='-pipe')
 default_env.Append(CCFLAGS='-fno-strict-aliasing')
 default_env.Append(CCFLAGS=Split('-Wall -Wno-sign-compare -Werror -Wundef'))
 
-# libelf build is described in its own SConscript file.  Using a
-# dictionary for exports lets us export "default_env" so the
-# SConscript will see it as "env".
-default_env.SConscript('m5/libelf/SConscript', exports={'env' : default_env})
-
-
 ###################################################
 #
 # Define build environments for selected configurations.