From a4a89726250e7155d012df45b554a70a39e71723 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Sun, 28 Feb 2016 12:57:12 -0500 Subject: [PATCH] Reference env directly This change will work when the new changes to base are merged... --- src/SConscript | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/SConscript b/src/SConscript index 3fbf6a0..4806671 100644 --- a/src/SConscript +++ b/src/SConscript @@ -14,14 +14,14 @@ files = [ ] toolchain_bin = Dir(os.environ['POLKA_TOOLCHAIN']).Dir('bin') -Replace(AS=toolchain_bin.File('i686-elf-as'), - CC=toolchain_bin.File('i686-elf-gcc'), - CXX=toolchain_bin.File('i686-elf-g++'), - LINK=toolchain_bin.File('i686-elf-ld')) -Append(CCFLAGS='-ffreestanding', - CPPDEFINES='__polka', - CXXFLAGS='-fno-exceptions -fno-rtti', - LINKFLAGS='-nostdlib -lgcc') +env.Replace(AS=toolchain_bin.File('i686-elf-as'), + CC=toolchain_bin.File('i686-elf-gcc'), + CXX=toolchain_bin.File('i686-elf-g++'), + LINK=toolchain_bin.File('i686-elf-ld')) +env.Append(CCFLAGS='-ffreestanding', + CPPDEFINES='__polka', + CXXFLAGS='-fno-exceptions -fno-rtti', + LINKFLAGS='-nostdlib -lgcc') # Global constructor files. These must be linked IN THIS ORDER. def crtfile_path(name):