summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2013-06-25 12:47:24 +0200
committerBen Noordhuis <info@bnoordhuis.nl>2013-06-25 12:47:24 +0200
commita0b6df080d210c5035574f378843aabd5074151c (patch)
tree9aa26c56825a0f98479980c431ddb173d61c88b6 /configure
parent3fac4157fef1b083e199e04affbb6432f70861c2 (diff)
downloadandroid-node-v8-a0b6df080d210c5035574f378843aabd5074151c.tar.gz
android-node-v8-a0b6df080d210c5035574f378843aabd5074151c.tar.bz2
android-node-v8-a0b6df080d210c5035574f378843aabd5074151c.zip
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 acbdabb74b1b8484671fd3c44cd9eb9a7ea11f41.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure13
1 files changed, 4 insertions, 9 deletions
diff --git a/configure b/configure
index eb91def793..77add2b42c 100755
--- a/configure
+++ b/configure
@@ -296,14 +296,11 @@ def pkg_config(pkg):
return (libs, cflags)
-def cc_macros(cc=None):
- """Checks predefined macros using the C compiler command."""
-
- if cc is None:
- cc = CC
+def cc_macros():
+ """Checks predefined macros using the CC command."""
try:
- p = subprocess.Popen(shlex.split(cc) + ['-dM', '-E', '-'],
+ p = subprocess.Popen(shlex.split(CC) + ['-dM', '-E', '-'],
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
@@ -378,9 +375,7 @@ def arm_hard_float_abi():
def host_arch_cc():
"""Host architecture check using the CC command."""
- # use 'cc', as CC may be set to a target arch compiler command
- # in case of cross-compilation
- k = cc_macros('cc')
+ k = cc_macros()
matchup = {
'__x86_64__' : 'x64',