ardour/livetrax
13
0
Fork 0
Code

Cleanup configuration stage

Browse Source 
* use print() only for errors
* use write_config_text() for normal operation
* fail if lld was requested, but not found
This commit is contained in:
Robin Gareus 2019-09-25 14:13:51 +02:00
parent d10c4c651c
commit b9ff3b1e77
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wscript
View File

@ -1239,13 +1239,10 @@ int main () { return 0; }
if (Options.options.use_lld): if (Options.options.use_lld):
if re.search ("linux", sys.platform) != None and Options.options.dist_target != 'mingw' and conf.env['BUILD_PABACKEND']: if re.search ("linux", sys.platform) != None and Options.options.dist_target != 'mingw' and conf.env['BUILD_PABACKEND']:
print("lld is only for Linux builds") print("lld is only for Linux builds")
sys.exit(1)
else: else:
try:
conf.find_program ('lld') conf.find_program ('lld')
conf.env.append_value('LINKFLAGS', '-fuse-ld=lld') conf.env.append_value('LINKFLAGS', '-fuse-ld=lld')
print ("Using the lld linker")
except conf.errors.ConfigurationError:
pass
if re.search ("linux", sys.platform) != None and Options.options.dist_target != 'mingw' and conf.env['BUILD_PABACKEND']: if re.search ("linux", sys.platform) != None and Options.options.dist_target != 'mingw' and conf.env['BUILD_PABACKEND']:
print("PortAudio Backend is not for Linux") print("PortAudio Backend is not for Linux")
@ -1345,6 +1342,7 @@ const char* const ardour_config_info = "\\n\\
write_config_text('Translation', opts.nls) write_config_text('Translation', opts.nls)
# write_config_text('Tranzport', opts.tranzport) # write_config_text('Tranzport', opts.tranzport)
write_config_text('Unit tests', conf.env['BUILD_TESTS']) write_config_text('Unit tests', conf.env['BUILD_TESTS'])
write_config_text('Use LLD linker', opts.use_lld)
write_config_text('Windows VST support', opts.windows_vst) write_config_text('Windows VST support', opts.windows_vst)
write_config_text('Wiimote support', conf.is_defined('BUILD_WIIMOTE')) write_config_text('Wiimote support', conf.is_defined('BUILD_WIIMOTE'))
write_config_text('Windows key', opts.windows_key) write_config_text('Windows key', opts.windows_key)