mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-06 14:54:56 +01:00
Revert "experimentally remove some C++11 flags (likely to return)"
This reverts commit a27ad61695053fc18a9630dd9e7c2418416ba915. This was not a fix for the problem it was an attempt to fix.
This commit is contained in:
parent
a9e84cee27
commit
5d45ccf970
1 changed files with 4 additions and 4 deletions
8
wscript
8
wscript
|
|
@ -375,14 +375,14 @@ int main() { return 0; }''',
|
||||||
compiler_flags.append ('-U__STRICT_ANSI__')
|
compiler_flags.append ('-U__STRICT_ANSI__')
|
||||||
|
|
||||||
if conf.options.cxx11 or conf.env['build_host'] in [ 'mavericks', 'yosemite' ]:
|
if conf.options.cxx11 or conf.env['build_host'] in [ 'mavericks', 'yosemite' ]:
|
||||||
# conf.check_cxx(cxxflags=["-std=c++11"])
|
conf.check_cxx(cxxflags=["-std=c++11"])
|
||||||
# cxx_flags.append('-std=c++11')
|
cxx_flags.append('-std=c++11')
|
||||||
if platform == "darwin":
|
if platform == "darwin":
|
||||||
# cxx_flags.append('--stdlib=libstdc++')
|
cxx_flags.append('--stdlib=libstdc++')
|
||||||
# Mavericks and later changed the syntax to be used when including Carbon headers,
|
# Mavericks and later changed the syntax to be used when including Carbon headers,
|
||||||
# from requiring a full path to requiring just the header name.
|
# from requiring a full path to requiring just the header name.
|
||||||
cxx_flags.append('-DCARBON_FLAT_HEADERS')
|
cxx_flags.append('-DCARBON_FLAT_HEADERS')
|
||||||
# linker_flags.append('--stdlib=libstdc++')
|
linker_flags.append('--stdlib=libstdc++')
|
||||||
# Prevents visibility issues in standard headers
|
# Prevents visibility issues in standard headers
|
||||||
conf.define("_DARWIN_C_SOURCE", 1)
|
conf.define("_DARWIN_C_SOURCE", 1)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue