From 6cdc9e85681b1efe95987516ef57a323866da034 Mon Sep 17 00:00:00 2001
From: Graham Dumpleton <Graham.Dumpleton@gmail.com>
Date: Mon, 2 Feb 2015 14:14:32 +1100
Subject: Shouldn't be merging apxs config vars.

---
 setup.py | 23 -----------------------
 1 file changed, 23 deletions(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 36bdd57..b6b71db 100644
--- a/setup.py
+++ b/setup.py
@@ -197,29 +197,6 @@ if WITH_TARBALL_PACKAGE:
     CONFIG['SBINDIR'] = get_apxs_config('sbindir')
     CONFIG['PROGNAME'] = get_apxs_config('progname')
 
-    _CFLAGS_NAMES = ['SHLTCFLAGS', 'CFLAGS', 'NOTEST_CPPFLAGS',
-        'EXTRA_CPPFLAGS', 'EXTRA_CFLAGS']
-
-    _CFLAGS_VALUES = []
-
-    for name in _CFLAGS_NAMES:
-        value = get_apxs_config(name)
-
-        # Heroku doesn't appear to run the same version of gcc
-        # that a standard Ubuntu installation does and which was
-        # used to originally build the Apache binaries. We need
-        # therefore to strip out flags that the Heroku gcc may
-        # not understand.
-
-        if value:
-            if os.path.isdir('/app/.heroku'):
-                value = value.replace('-prefer-pic', '')
-
-        if value:
-            _CFLAGS_VALUES.append(value)
-
-    CONFIG['CFLAGS'] = ' '.join(_CFLAGS_VALUES)
-
 else:
     def get_apxs_config(query):
         p = subprocess.Popen([APXS, '-q', query],
-- 
cgit v1.2.1