|
@@ -167,6 +167,12 @@ if 'dtrace' in get_option('trace_backends')
|
|
endif
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
|
|
|
|
+if get_option('iasl') == ''
|
|
|
|
+ iasl = find_program('iasl', required: false)
|
|
|
|
+else
|
|
|
|
+ iasl = find_program(get_option('iasl'), required: true)
|
|
|
|
+endif
|
|
|
|
+
|
|
##################
|
|
##################
|
|
# Compiler flags #
|
|
# Compiler flags #
|
|
##################
|
|
##################
|
|
@@ -1584,8 +1590,8 @@ foreach k : get_option('trace_backends')
|
|
config_host_data.set('CONFIG_TRACE_' + k.to_upper(), true)
|
|
config_host_data.set('CONFIG_TRACE_' + k.to_upper(), true)
|
|
endforeach
|
|
endforeach
|
|
config_host_data.set_quoted('CONFIG_TRACE_FILE', get_option('trace_file'))
|
|
config_host_data.set_quoted('CONFIG_TRACE_FILE', get_option('trace_file'))
|
|
-if get_option('iasl') != ''
|
|
|
|
- config_host_data.set_quoted('CONFIG_IASL', get_option('iasl'))
|
|
|
|
|
|
+if iasl.found()
|
|
|
|
+ config_host_data.set_quoted('CONFIG_IASL', iasl.full_path())
|
|
endif
|
|
endif
|
|
config_host_data.set_quoted('CONFIG_BINDIR', get_option('prefix') / get_option('bindir'))
|
|
config_host_data.set_quoted('CONFIG_BINDIR', get_option('prefix') / get_option('bindir'))
|
|
config_host_data.set_quoted('CONFIG_PREFIX', get_option('prefix'))
|
|
config_host_data.set_quoted('CONFIG_PREFIX', get_option('prefix'))
|
|
@@ -3631,11 +3637,7 @@ summary_info += {'sphinx-build': sphinx_build}
|
|
if config_host.has_key('HAVE_GDB_BIN')
|
|
if config_host.has_key('HAVE_GDB_BIN')
|
|
summary_info += {'gdb': config_host['HAVE_GDB_BIN']}
|
|
summary_info += {'gdb': config_host['HAVE_GDB_BIN']}
|
|
endif
|
|
endif
|
|
-if get_option('iasl') != ''
|
|
|
|
- summary_info += {'iasl': get_option('iasl')}
|
|
|
|
-else
|
|
|
|
- summary_info += {'iasl': false}
|
|
|
|
-endif
|
|
|
|
|
|
+summary_info += {'iasl': iasl}
|
|
summary_info += {'genisoimage': config_host['GENISOIMAGE']}
|
|
summary_info += {'genisoimage': config_host['GENISOIMAGE']}
|
|
if targetos == 'windows' and have_ga
|
|
if targetos == 'windows' and have_ga
|
|
summary_info += {'wixl': wixl}
|
|
summary_info += {'wixl': wixl}
|