[gtk-osx] Fix default target parameter to setup_sdk.
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx] Fix default target parameter to setup_sdk.
- Date: Mon, 1 May 2017 21:37:00 +0000 (UTC)
commit 88755cbc10c23aa8e999bb3189251cf4dd248fcf
Author: John Ralls <jralls ceridwen us>
Date: Mon May 1 14:29:35 2017 -0700
Fix default target parameter to setup_sdk.
Float wasn't right\!
jhbuildrc-gtk-osx | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 752c490..16051fa 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -27,6 +27,7 @@ import re
#some variables we'll need defined later
_default_arch = ""
_osx_version = 0.0
+_target = '10.8'
def _popen(cmd_arg):
from subprocess import Popen, PIPE
@@ -87,13 +88,14 @@ jhbuild.commands.register_command(_getenv)
# Determine the native system:
def osx_ver():
- global _default_arch, _osx_version
+ global _default_arch, _osx_version, _target
vstring = _popen("uname -r")
mstring = _popen("machine")
exp = re.compile(r'(\d+\.\d+)\.\d+')
vernum = exp.match(vstring)
_osx_version = float(vernum.group(1)) - 4.0
-
+ _target = '10.%d' % int(_osx_version)
+
x64bit = _popen("sysctl hw.cpu64bit_capable").endswith("1")
if x64bit and _osx_version >= 6.0:
_default_arch = "x86_64"
@@ -204,7 +206,7 @@ osx_ver()
#
# For most users accepting the defaults is the right course.
-def setup_sdk(target=_osx_version, sdk_version=None, architectures=[_default_arch]):
+def setup_sdk(target=_target, sdk_version=None, architectures=[_default_arch]):
os.environ["MACOSX_DEPLOYMENT_TARGET"] = target
sdkdir = None
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]