Issue #22359: Merge cross-compilation fix from 3.5
authorMartin Panter <vadmium+py@gmail.com>
Sat, 23 Apr 2016 01:18:54 +0000 (01:18 +0000)
committerMartin Panter <vadmium+py@gmail.com>
Sat, 23 Apr 2016 01:18:54 +0000 (01:18 +0000)
1  2 
Makefile.pre.in
Misc/NEWS
configure
configure.ac

diff --cc Makefile.pre.in
Simple merge
diff --cc Misc/NEWS
index 3f4eb43c92df30de6d2f9bde6373e21b0d58837a,07b7fde759dc889e65f54dff23ec547a52bba896..514fa3d467c5c7f2fb50989d6731d77a19363f46
+++ b/Misc/NEWS
@@@ -1005,8 -404,13 +1005,13 @@@ Test
  Build
  -----
  
+ - Issue #22359: Disable the rules for running _freeze_importlib and pgen when
+   cross-compiling.  The output of these programs is normally saved with the
+   source code anyway, and is still regenerated when doing a native build.
+   Patch by Xavier de Gaye.
  - Issue #21668: Link audioop, _datetime, _ctypes_test modules to libm,
 -  except on Mac OS X. Patch written by Xavier de Gaye.
 +  except on Mac OS X. Patch written by Chi Hsuan Yen.
  
  - Issue #25702: A --with-lto configure option has been added that will
    enable link time optimizations at build time during a make profile-opt.
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge