Browse Source

configure: fix cross-compilation host_arch_cc()

In case of cross-compilation host_arch_cc() function could return
target arch if CC was set to target arch compiler. Host arch
compiler should always be used in this case. This was broken
by commit 707863c.
v0.10.12-release
Andrei Sedoi 12 years ago
committed by Ben Noordhuis
parent
commit
acbdabb74b
  1. 13
      configure

13
configure

@ -296,11 +296,14 @@ def pkg_config(pkg):
return (libs, cflags) return (libs, cflags)
def cc_macros(): def cc_macros(cc=None):
"""Checks predefined macros using the CC command.""" """Checks predefined macros using the C compiler command."""
if cc is None:
cc = CC
try: try:
p = subprocess.Popen(shlex.split(CC) + ['-dM', '-E', '-'], p = subprocess.Popen(shlex.split(cc) + ['-dM', '-E', '-'],
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE) stderr=subprocess.PIPE)
@ -375,7 +378,9 @@ def arm_hard_float_abi():
def host_arch_cc(): def host_arch_cc():
"""Host architecture check using the CC command.""" """Host architecture check using the CC command."""
k = cc_macros() # use 'cc', as CC may be set to a target arch compiler command
# in case of cross-compilation
k = cc_macros('cc')
matchup = { matchup = {
'__x86_64__' : 'x64', '__x86_64__' : 'x64',

Loading…
Cancel
Save