From 8ed563336797d6e9d52084ec132f0cd13c8ee342 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 25 Feb 2015 21:11:55 +0100 Subject: [PATCH] fix osx version detection in da975ae --- wscript | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/wscript b/wscript index a96ddcb7cf..1f8b61ce19 100644 --- a/wscript +++ b/wscript @@ -797,7 +797,12 @@ def configure(conf): conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'AudioToolbox', '-framework', 'AudioUnit']) conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Cocoa']) - if ( re.search ("^[1-9][0-9]\.", os.uname()[2]) == None or os.uname()[2] == "10" ) and (Options.options.generic or Options.options.ppc) and not Options.options.nocarbon: + if ( + # osx up to and including 10.6 (uname 10.X.X) + (re.search ("^[1-9][0-9]\.", os.uname()[2]) == None or not re.search ("^10\.", os.uname()[2]) == None) + and (Options.options.generic or Options.options.ppc) + and not Options.options.nocarbon + ): conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DWITH_CARBON") conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Carbon']) else: