Switch from getting LDFLAGS and CPPFLAGS from the environment to the Makefile.

This is to avoid a problem that inconsistently comes up where the environment
variable is unset while the Makefile clearly has the values set and are used
during ``make``.

Closes bug #1081045.

1 files changed, 5 insertions, 5 deletions

diff --git a/setup.py b/setup.py
index 0cb5ab17e4..61cf811a38 100644
--- a/setup.py
+++ b/setup.py
@@ -244,14 +244,14 @@ class PyBuildExt(build_ext):
 
         # Add paths specified in the environment variables LDFLAGS and
         # CPPFLAGS.
-        # Since this file tends to be executed by ``make install`` its
-        # environment variables are those that the Makefile sets and not what
-        # the shell has.  The Makefile must keep the shell's values somewhere
-        # in order to be able to reach them at execution time.
+        # We must get the values from the Makefile and not the environment
+        # directly since an inconsistently reproducible issue comes up where
+        # the environment variable is not set even though the value were passed
+        # into configure and stored in the Makefile.
         for env_var, arg_name, dir_list in (
                 ('LDFLAGS', '-L', self.compiler.library_dirs),
                 ('CPPFLAGS', '-I', self.compiler.include_dirs)):
-            env_val = os.getenv(env_var)
+            env_val = sysconfig.get_config_var(env_var)
             if env_val:
                 parser = optparse.OptionParser()
                 parser.add_option(arg_name, dest="dirs", action="append")