Accept SHLINKFLAGS from the environment.

1 files changed, 5 insertions, 4 deletions

diff --git a/SConstruct b/SConstruct
index 442e92fb..85e242a7 100644
--- a/SConstruct
+++ b/SConstruct
@@ -161,9 +161,10 @@ for (name, default, help) in pathopts:
 env['VERSION'] = gpsd_version
 env['PYTHON'] = sys.executable
 
-# Set defaults from environment.  Note that scons doesn't cope well with
-# multi-word CPPFLAGS and LDFLAGS values; you'll have to explicitly quote
-# them or (better yet) use the "=" form of GNU option settings.
+# Set defaults from environment.  Note that scons doesn't cope well
+# with multi-word CPPFLAGS/LDFLAGS/SHLINKFLAGS values; you'll have to
+# explicitly quote them or (better yet) use the "=" form of GNU option
+# settings.
 env['STRIP'] = "strip"
 env['CHRPATH'] = 'chrpath'
 for i in ["AR", "ARFLAGS", "CCFLAGS", "CFLAGS", "CC", "CXX", "CXXFLAGS", "STRIP", "CHRPATH", "LD", "TAR"]:
@@ -175,7 +176,7 @@ 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", "CPPFLAGS"]:
+for flags in ["LDFLAGS", "SHLINKFLAGS", "CPPFLAGS"]:
     if os.environ.has_key(flags):
         env.MergeFlags([os.getenv(flags)])