Do a better job of merging flags from the external environment.

1 files changed, 2 insertions, 2 deletions

diff --git a/SConstruct b/SConstruct
index c59f2a2c..0334e7f0 100644
--- a/SConstruct
+++ b/SConstruct
@@ -179,9 +179,9 @@ for i in ["AR", "ARFLAGS", "CCFLAGS", "CFLAGS", "CC", "CXX", "CXXFLAGS", "STRIP"
             env.Replace(**{j: Split(os.getenv(i))})
         else:
             env.Replace(**{j: os.getenv(i)})
-for flags in ["LDFLAGS", "SHLINKFLAGS", "CPPFLAGS"]:
+for flags in ["LDFLAGS", "LINKFLAGS", "SHLINKFLAGS", "CPPFLAGS"]:
     if os.environ.has_key(flags):
-        env.MergeFlags([os.getenv(flags)])
+        env.MergeFlags({flags : os.getenv(flags)})
 
 
 # Placeholder so we can kluge together something like VPATH builds.