Browse Source

Revert "configure: fix cross-compilation host_arch_cc()"

Several people have reported cross-compiling build breakage, see e.g.
https://groups.google.com/forum/#!topic/nodejs/k8HzqpqPkJQ

Message-Id: <823c3bd1-e104-4409-86ad-0ab6de936fec@googlegroups.com>
Subject: [nodejs] nodejs 0.10.12 and Angstrom issues

This reverts commit acbdabb74b.
v0.10.13-release
Ben Noordhuis 12 years ago
parent
commit
a0b6df080d
  1. 13
      configure

13
configure

@ -296,14 +296,11 @@ def pkg_config(pkg):
return (libs, cflags) return (libs, cflags)
def cc_macros(cc=None): def cc_macros():
"""Checks predefined macros using the C compiler command.""" """Checks predefined macros using the CC 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)
@ -378,9 +375,7 @@ 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."""
# use 'cc', as CC may be set to a target arch compiler command k = cc_macros()
# in case of cross-compilation
k = cc_macros('cc')
matchup = { matchup = {
'__x86_64__' : 'x64', '__x86_64__' : 'x64',

Loading…
Cancel
Save