Index: tools/gn/config_values_generator.cc |
diff --git a/tools/gn/config_values_generator.cc b/tools/gn/config_values_generator.cc |
index ca87d6363aea35c7df189f62ebb8ae1c0f012764..86ec02ef3ac1f03630a087bedeaa57797e2c81d3 100644 |
--- a/tools/gn/config_values_generator.cc |
+++ b/tools/gn/config_values_generator.cc |
@@ -79,11 +79,19 @@ void ConfigValuesGenerator::Run() { |
FILL_DIR_CONFIG_VALUE( include_dirs) |
FILL_STRING_CONFIG_VALUE(ldflags) |
FILL_DIR_CONFIG_VALUE( lib_dirs) |
- FILL_STRING_CONFIG_VALUE(libs) |
#undef FILL_STRING_CONFIG_VALUE |
#undef FILL_DIR_CONFIG_VALUE |
+ // Libs |
+ const Value* libs_value = scope_->GetValue("libs", true); |
+ if (libs_value) { |
+ std::vector<LibFile> result; |
brettw
2015/12/18 00:04:55
I think you can avoid this temporary and have Extr
agrieve
2015/12/18 15:39:07
Done.
|
+ ExtractListOfLibs(scope_->settings()->build_settings(), *libs_value, |
+ input_dir_, &result, err_); |
+ config_values_->libs().swap(result); |
+ } |
+ |
// Precompiled headers. |
const Value* precompiled_header_value = |
scope_->GetValue(variables::kPrecompiledHeader, true); |