Merge pull request #21721 from meeseeksmachine/auto-backport-of-pr-21720-on-v3.5.x

QuLogic · web-flow · commit d09703b9d11b · 2021-11-22T20:51:22.000-05:00
Backport PR #21720 on branch v3.5.x (Fix compiler configuration priority for FreeType build)
diff --git a/setupext.py b/setupext.py
@@ -610,13 +610,13 @@ def do_custom_build(self, env):
         print(f"Building freetype in {src_path}")
         if sys.platform != 'win32':  # compilation on non-windows
             env = {
-                **env,
                 **{
                     var: value
                     for var, value in sysconfig.get_config_vars().items()
                     if var in {"CC", "CFLAGS", "CXX", "CXXFLAGS", "LD",
                                "LDFLAGS"}
                 },
+                **env,
             }
             env["CFLAGS"] = env.get("CFLAGS", "") + " -fPIC"
             configure = [
