[gtk-osx] Fix error with selecting compiler under Tiger
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx] Fix error with selecting compiler under Tiger
- Date: Sat, 15 Oct 2011 22:12:34 +0000 (UTC)
commit 44d2e40d24dab964b6148467fa04e9760917bf5b
Author: John Ralls <jralls ceridwen us>
Date: Sat Oct 15 15:11:50 2011 -0700
Fix error with selecting compiler under Tiger
Tiger's uname version is 8, not 10, and there's no need to set the compiler for a particular SDK.
jhbuildrc-gtk-osx | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 1256df8..b620579 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -230,15 +230,12 @@ def setup_sdk(target, sdk_version, architectures=[_default_arch]):
os.environ["VERSIONER_PYTHON_PREFER_32_BIT"] = "yes"
#SDK 10.4 doesn't support gcc4.2.
- if _osx_version.startswith("10.") and sdk_version.startswith("10.4"):
+ if _osx_version.startswith("8."):
os.environ["CC"] = "/usr/bin/gcc-4.0"
os.environ["CXX"] = "/usr/bin/g++-4.0"
- append_autogenargs("gnutls", "--disable-guile")
else:
os.environ["CC"] = "/usr/bin/gcc-4.2"
os.environ["CXX"] = "/usr/bin/g++-4.2"
- append_autogenargs("gnutls", "--disable-guile")
-
# Set the -arch flags for everything we're building.
#
@@ -285,6 +282,7 @@ def setup_sdk(target, sdk_version, architectures=[_default_arch]):
or _osx_version.startswith("11")))):
append_autogenargs("glib", "ac_cv_compliant_posix_memalign=no")
+ append_autogenargs("gnutls", "--disable-guile")
return sdkdir
# This is a convenience function for older .jhbuildrc-customs.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]