projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
331b23c
)
really fix osx mavericks detection
author
Robin Gareus
<robin@gareus.org>
Sat, 24 May 2014 22:21:20 +0000
(
00:21
+0200)
committer
Robin Gareus
<robin@gareus.org>
Sat, 24 May 2014 22:21:20 +0000
(
00:21
+0200)
wscript
patch
|
blob
|
history
diff --git
a/wscript
b/wscript
index 3fb33e13c60bd461f770828992b1087f7a8353d9..12997e7f82a9942e64bddcd4c169657cf4f05977 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-148,15
+148,6
@@
def set_compiler_flags (conf,opt):
# waf adds -O0 -g itself. thanks waf!
is_clang = conf.env['CXX'][0].endswith('clang++')
# waf adds -O0 -g itself. thanks waf!
is_clang = conf.env['CXX'][0].endswith('clang++')
- if conf.options.cxx11 or conf.env['build_target'] == 'mavericks':
- conf.check_cxx(cxxflags=["-std=c++11"])
- cxx_flags.append('-std=c++11')
- if platform == "darwin":
- cxx_flags.append('-stdlib=libc++')
- linker_flags.append('-lc++')
- # Prevents visibility issues in standard headers
- conf.define("_DARWIN_C_SOURCE", 1)
-
if conf.options.asan:
conf.check_cxx(cxxflags=["-fsanitize=address", "-fno-omit-frame-pointer"], linkflags=["-fsanitize=address"])
cxx_flags.append('-fsanitize=address')
if conf.options.asan:
conf.check_cxx(cxxflags=["-fsanitize=address", "-fno-omit-frame-pointer"], linkflags=["-fsanitize=address"])
cxx_flags.append('-fsanitize=address')
@@
-186,8
+177,10
@@
def set_compiler_flags (conf,opt):
conf.env['build_target'] = 'snowleopard'
elif re.search ("^11[.]", version) != None:
conf.env['build_target'] = 'lion'
conf.env['build_target'] = 'snowleopard'
elif re.search ("^11[.]", version) != None:
conf.env['build_target'] = 'lion'
- el
s
e:
+ el
if re.search ("^12[.]", version) != Non
e:
conf.env['build_target'] = 'mountainlion'
conf.env['build_target'] = 'mountainlion'
+ else:
+ conf.env['build_target'] = 'mavericks' # 13.0.0
else:
match = re.search(
"(?P<cpu>i[0-6]86|x86_64|powerpc|ppc|ppc64|arm|s390x?)",
else:
match = re.search(
"(?P<cpu>i[0-6]86|x86_64|powerpc|ppc|ppc64|arm|s390x?)",
@@
-208,6
+201,15
@@
def set_compiler_flags (conf,opt):
#
compiler_flags.append ('-U__STRICT_ANSI__')
#
compiler_flags.append ('-U__STRICT_ANSI__')
+ if conf.options.cxx11 or conf.env['build_target'] == 'mavericks':
+ conf.check_cxx(cxxflags=["-std=c++11"])
+ cxx_flags.append('-std=c++11')
+ if platform == "darwin":
+ cxx_flags.append('-stdlib=libc++')
+ linker_flags.append('-lc++')
+ # Prevents visibility issues in standard headers
+ conf.define("_DARWIN_C_SOURCE", 1)
+
if ((re.search ("i[0-9]86", cpu) != None) or (re.search ("x86_64", cpu) != None)) and conf.env['build_target'] != 'none':
if ((re.search ("i[0-9]86", cpu) != None) or (re.search ("x86_64", cpu) != None)) and conf.env['build_target'] != 'none':