@@ -82,15 +82,30 @@ def run(command, *, host=None, env=None, log=True, **kwargs):
8282if env is None :
8383env = os .environ .copy ()
8484if host :
85- env .update (android_env (host ))
85+ # The -I and -L arguments used when building Python should not be reused
86+ # when building third-party extension modules, so pass them via the
87+ # NODIST environment variables.
88+ host_env = android_env (host )
89+ for name in ["CFLAGS" ,"CXXFLAGS" ,"LDFLAGS" ]:
90+ flags = []
91+ nodist = []
92+ for word in host_env [name ].split ():
93+ (nodist if word .startswith (("-I" ,"-L" ))else flags ).append (word )
94+ host_env [name ]= " " .join (flags )
95+ host_env [f"{ name } ]= " " .join (nodist )
96+
97+ print_env (host_env )
98+ env .update (host_env )
8699
87100if log :
88101print (">" ," " .join (map (str ,command )))
89102return subprocess .run (command ,env = env ,** kwargs )
90103
91104
92- def print_env (context ):
93- android_env (getattr (context ,"host" ,None ))
105+ # Format the environment so it can be pasted into a shell.
106+ def print_env (env ):
107+ for key ,value in sorted (env .items ()):
108+ print (f"export{ key } { shlex .quote (value )} )
94109
95110
96111def android_env (host ):
@@ -126,10 +141,6 @@ def android_env(host):
126141if not env :
127142raise ValueError (f"Found no variables in{ env_script .name } \n "
128143+ env_output )
129-
130- # Format the environment so it can be pasted into a shell.
131- for key ,value in sorted (env .items ()):
132- print (f"export{ key } { shlex .quote (value )} )
133144return env
134145
135146
@@ -220,9 +231,12 @@ def make_host_python(context):
220231for pattern in ("include/python*" ,"lib/libpython*" ,"lib/python*" ):
221232delete_glob (f"{ prefix_dir } { pattern } )
222233
234+ # The Android environment variables were already captured in the Makefile by
235+ # `configure`, and passing them again when running `make` may cause some
236+ # flags to be duplicated. So we don't use the `host` argument here.
223237os .chdir (host_dir )
224- run (["make" ,"-j" ,str (os .cpu_count ())], host = context . host )
225- run (["make" ,"install" ,f"prefix={ prefix_dir } ], host = context . host )
238+ run (["make" ,"-j" ,str (os .cpu_count ())])
239+ run (["make" ,"install" ,f"prefix={ prefix_dir } ])
226240
227241
228242def build_all (context ):
@@ -628,6 +642,10 @@ def package(context):
628642print (f"Wrote{ package_path } )
629643
630644
645+ def env (context ):
646+ print_env (android_env (getattr (context ,"host" ,None )))
647+
648+
631649# Handle SIGTERM the same way as SIGINT. This ensures that if we're terminated
632650# by the buildbot worker, we'll make an attempt to clean up our subprocesses.
633651def install_signal_handler ():
@@ -717,7 +735,7 @@ def main():
717735"build-testbed" :build_testbed ,
718736"test" :run_testbed ,
719737"package" :package ,
720- "env" :print_env ,
738+ "env" :env ,
721739 }
722740
723741try :