Merge pull request #322 from thesamesam/cflags

Use CFLAGS if set as-is, match CXXFLAGS behavior
pypa · Dec 27, 2024 · c97a3db · c97a3db
2 parents a8eec20 + 630551a
commit c97a3db
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/distutils/sysconfig.py b/distutils/sysconfig.py
@@ -340,6 +340,7 @@ def customize_compiler(compiler):
 
         ldshared = _add_flags(ldshared, 'LD')
         ldcxxshared = _add_flags(ldcxxshared, 'LD')
+        cflags = os.environ.get('CFLAGS', cflags)
         cflags = _add_flags(cflags, 'C')
         ldshared = _add_flags(ldshared, 'C')
         cxxflags = os.environ.get('CXXFLAGS', cxxflags)

diff --git a/distutils/tests/test_sysconfig.py b/distutils/tests/test_sysconfig.py
@@ -130,9 +130,11 @@ def test_customize_compiler(self):
         comp = self.customize_compiler()
         assert comp.exes['archiver'] == 'env_ar --env-arflags'
         assert comp.exes['preprocessor'] == 'env_cpp --env-cppflags'
-        assert comp.exes['compiler'] == 'env_cc --sc-cflags --env-cflags --env-cppflags'
+        assert (
+            comp.exes['compiler'] == 'env_cc --env-cflags --env-cflags --env-cppflags'
+        )
         assert comp.exes['compiler_so'] == (
-            'env_cc --sc-cflags --env-cflags --env-cppflags --sc-ccshared'
+            'env_cc --env-cflags --env-cflags --env-cppflags --sc-ccshared'
         )
         assert (
             comp.exes['compiler_cxx']