From 7af666c26c69a67f9a00d6b5b3fb3e78237ec5de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krystian=20Bac=C5=82awski?= <krystian.baclawski@gmail.com>
Date: Sat, 5 Mar 2016 20:12:47 +0100
Subject: [PATCH] Fixed a bug with Python headers on 64-bit Debian.

---
 common.py      |  2 +-
 toolchain-m68k | 20 +++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/common.py b/common.py
index df55a2d..9b92efe 100644
--- a/common.py
+++ b/common.py
@@ -454,7 +454,7 @@ def make(name, target=None, **makevars):
 def require_header(header, lang, msg='', symbol=None, value=None):
   debug('require_header "%s"', header)
 
-  cmd = {'c': '{cc}', 'c++': '{cxx}'}[lang]
+  cmd = {'c': os.environ['CC'], 'c++': os.environ['CXX']}[lang]
   cmd = fill_in(cmd).split()
   proc = subprocess.Popen(cmd + ['-fsyntax-only', '-x', lang, '-'],
                           stdin=subprocess.PIPE,
diff --git a/toolchain-m68k b/toolchain-m68k
index 38d0050..c44d675 100755
--- a/toolchain-m68k
+++ b/toolchain-m68k
@@ -216,6 +216,9 @@ def build():
   else:
     CC, CXX = 'gcc', 'g++'
 
+  CC = find_executable(CC)
+  CXX = find_executable(CXX)
+
   """
   On 64-bit architecture GNU Assembler crashes writing out an object, due to
   (probably) miscalculated structure sizes.  There could be some other bugs
@@ -225,10 +228,9 @@ def build():
 
   ARCH = '-m32' if platform.machine() == 'x86_64' else ''
 
-  environ['CC'] = ' '.join([find_executable(CC), ARCH])
-  environ['CXX'] = ' '.join([find_executable(CXX), ARCH])
-
-  environ['PATH'] = ":".join([path.join('{target}', 'bin'),
+  environ['CC'] = CC + ' ' + ARCH
+  environ['CXX'] = CXX + ' ' + ARCH
+  environ['PATH'] = ':'.join([path.join('{target}', 'bin'),
                               path.join('{host}', 'bin'),
                               environ['PATH']])
 
@@ -248,12 +250,12 @@ def build():
   require_header('ncurses.h', 'c', 'libncurses-dev package missing')
 
   py_ver = 'python%d.%d' % (sys.version_info.major, sys.version_info.minor)
+  with env(CC=CC, CXX=CXX):
+    require_header(path.join(py_ver, 'Python.h'), 'c',
+                   'python-dev package missing')
 
-  require_header(path.join(py_ver, 'Python.h'), 'c',
-                 'python-dev package missing')
-
-  unpack('python-lha', work_dir='{build}')
-  python_setup('python-lha')
+    unpack('python-lha', work_dir='{build}')
+    python_setup('python-lha')
 
   unpack('{m4}')
   configure('{m4}', '--prefix={host}')