From bee4d454e84c12e96e7b929e5a9abefa2ae6746a Mon Sep 17 00:00:00 2001
From: Ali Saidi <saidi@eecs.umich.edu>
Date: Mon, 7 Apr 2008 23:40:24 -0400
Subject: SCons: Make BATCH options global sticky so libelf is built
 appropriately.

--HG--
extra : convert_revision : 4bca5c31b8421305d41aac072696964b39d7ff16
---
 ext/libelf/SConscript | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'ext')

diff --git a/ext/libelf/SConscript b/ext/libelf/SConscript
index 3d35b0c07..3db526c13 100644
--- a/ext/libelf/SConscript
+++ b/ext/libelf/SConscript
@@ -87,16 +87,9 @@ ElfFile('libelf_convert.c')
 ElfFile('libelf_fsize.c')
 ElfFile('libelf_msize.c')
 
-m4env = Environment(ENV=os.environ)
-
-if env.get('CC'):
-    m4env['CC'] = env['CC']
-if env.get('CXX'):
-    m4env['CXX'] = env['CXX']
-
-if env.get('OSX64bit'):
-    m4env.Append(CFLAGS='-arch x86_64')
-    m4env.Append(LINKFLAGS='-arch x86_64')
+m4env = env.Copy()
+del m4env['CCFLAGS']
+del m4env['CPPPATH']
 
 # If we have gm4 use it
 if m4env.Detect('gm4'):
-- 
cgit v1.2.3