Issue #20211: Merge 3.6.

diff --cc Misc/NEWS
index 095ae0e82c0061274b851525b41d3949cba0c74d,97502a999b0d3df11e80696a63741ea0b63b4ed4..1c1ebdb04a0daac554be79f9bdfab0517c332a9b
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -540,29 -623,6 +540,33 @@@ Documentatio
  Build
  -----
  
++- Issue #20211: Do not add the directory for installing C header files and the
++  directory for installing object code libraries to the cross compilation
++  search paths. Original patch by Thomas Petazzoni.
++
 +- Issue #28849: Do not define sys.implementation._multiarch on Android.
 +
 +- Issue #10656: Fix out-of-tree building on AIX.  Patch by Tristan Carel and
 +  Michael Haubenwallner.
 +
 +- Issue #26359: Rename --with-optimiations to --enable-optimizations.
 +
 +- Issue #28444: Fix missing extensions modules when cross compiling.
 +
 +- Issue #28208: Update Windows build and OS X installers to use SQLite 3.14.2.
 +
 +- Issue #28248: Update Windows build and OS X installers to use OpenSSL 1.0.2j.
 +
 +- Issue #21124: Fix building the _struct module on Cygwin by passing ``NULL``
 +  instead of ``&PyType_Type`` to PyVarObject_HEAD_INIT.  Patch by Masayuki
 +  Yamamoto.
 +
 +- Issue #13756: Fix building extensions modules on Cygwin.  Patch by Roumen
 +  Petrov, based on original patch by Jason Tishler.
 +
 +- Issue #21085: Add configure check for siginfo_t.si_band, which Cygwin does
 +  not provide.  Patch by Masayuki Yamamoto with review and rebase by Erik Bray.
 +
  - Issue #28258: Fixed build with Estonian locale (python-config and distclean
    targets in Makefile).  Patch by Arfrever Frehtes Taifersar Arahesis.
  

diff --cc setup.py
Simple merge