Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Unified Diff: tools/gn/config_values_generator.cc

Issue 1530183005: Special-case paths that appear in libs by not prefixing them with -l. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix typo in previous patch Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/gn/config_values.h ('k') | tools/gn/gn.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..3cc8235face1472d3c858b8f82c736e5c45d12f8 100644
--- a/tools/gn/config_values_generator.cc
+++ b/tools/gn/config_values_generator.cc
@@ -24,9 +24,7 @@ void GetStringList(
if (!value)
return; // No value, empty input and succeed.
- std::vector<std::string> result;
- ExtractListOfStringValues(*value, &result, err);
- (config_values->*accessor)().swap(result);
+ ExtractListOfStringValues(*value, &(config_values->*accessor)(), err);
}
void GetDirList(
@@ -79,11 +77,17 @@ 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) {
+ ExtractListOfLibs(scope_->settings()->build_settings(), *libs_value,
+ input_dir_, &config_values_->libs(), err_);
+ }
+
// Precompiled headers.
const Value* precompiled_header_value =
scope_->GetValue(variables::kPrecompiledHeader, true);
« no previous file with comments | « tools/gn/config_values.h ('k') | tools/gn/gn.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698