From 3a096023afa8d35903eca17b141fc0b8ffbc227d Mon Sep 17 00:00:00 2001
From: Anders F Bjorklund <afb@users.sourceforge.net>
Date: Sun, 24 Apr 2011 10:00:45 +0200
Subject: [PATCH] Fix the uname machine, on darwin/macosx

---
 zeroinstall/injector/arch.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/zeroinstall/injector/arch.py b/zeroinstall/injector/arch.py
index 816a504..ed98765 100644
--- a/zeroinstall/injector/arch.py
+++ b/zeroinstall/injector/arch.py
@@ -27,6 +27,11 @@ import os
 # Higher numbers are worse but usable.
 try:
 	_uname = os.uname()
+	# On Darwin, machine is wrong.
+	if _uname[0] == 'Darwin' and _uname[-1] == 'i386':
+		_cpu64 = os.popen('sysctl -n hw.cpu64bit_capable 2>&1').next().strip()
+		if _cpu64 == '1':
+			_uname = tuple(list(_uname[:-1])+['x86_64'])
 except AttributeError:
 	# No uname. Probably Windows.
 	import sys
-- 
2.11.4.GIT