update NSM executable name - fixes #6620

[ardour.git] / wscript

diff --git a/wscript b/wscript
index b24e561e960decd4e2a52675817ce11aecbfee82..14d660276d06a8d01d45bd7950c16cd051b574c9 100644 (file)
--- a/wscript
+++ b/wscript
@@ -394,6 +394,8 @@ int main() { return 0; }''',
             linker_flags.append('--stdlib=libstdc++')
             # Prevents visibility issues in standard headers
             conf.define("_DARWIN_C_SOURCE", 1)
+        else:
+            cxx_flags.append('-DBOOST_NO_AUTO_PTR')
 
     if (is_clang and platform == "darwin") or conf.env['build_host'] in ['mavericks', 'yosemite']:
         # Silence warnings about the non-existing osx clang compiler flags
@@ -748,12 +750,6 @@ def configure(conf):
     autowaf.configure(conf)
     autowaf.display_header('Ardour Configuration')
 
-    gcc_versions = fetch_gcc_version(str(conf.env['CC']))
-    if not Options.options.debug and gcc_versions[0] == '4' and gcc_versions[1] > '4':
-        print('Version 4.5 of gcc is not ready for use when compiling Ardour with optimization.')
-        print('Please use a different version or re-configure with --debug')
-        exit (1)
-
     # systems with glibc have libintl builtin. systems without require explicit
     # linkage against libintl.
     #
@@ -1068,6 +1064,7 @@ int main () { int x = SFC_AUTO_DOWNGRADE_RF64; return 0; }
         sub_config_and_use(conf, 'libs/appleutility')
     elif Options.options.dist_target != 'mingw':
         sub_config_and_use(conf, 'tools/sanity_check')
+        sub_config_and_use(conf, 'tools/gccabicheck')
 
     sub_config_and_use(conf, 'libs/clearlooks-newer')
 
@@ -1183,6 +1180,7 @@ def build(bld):
         bld.recurse('libs/appleutility')
     elif bld.env['build_target'] != 'mingw':
         bld.recurse('tools/sanity_check')
+        bld.recurse('tools/gccabicheck')
 
     bld.recurse('libs/clearlooks-newer')