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

Side by Side Diff: tools/gn/config_values.cc

Issue 1919813003: Apply arflags to dependent configs in GN. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months 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 unified diff | Download patch
« no previous file with comments | « tools/gn/config_values.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "tools/gn/config_values.h" 5 #include "tools/gn/config_values.h"
6 6
7 namespace { 7 namespace {
8 8
9 template<typename T> 9 template<typename T>
10 void VectorAppend(std::vector<T>* append_to, 10 void VectorAppend(std::vector<T>* append_to,
11 const std::vector<T>& append_this) { 11 const std::vector<T>& append_this) {
12 if (append_this.empty()) 12 if (append_this.empty())
13 return; 13 return;
14 append_to->insert(append_to->end(),append_this.begin(), append_this.end()); 14 append_to->insert(append_to->end(),append_this.begin(), append_this.end());
15 } 15 }
16 16
17 } // namespace 17 } // namespace
18 18
19 ConfigValues::ConfigValues() { 19 ConfigValues::ConfigValues() {
20 } 20 }
21 21
22 ConfigValues::~ConfigValues() { 22 ConfigValues::~ConfigValues() {
23 } 23 }
24 24
25 void ConfigValues::AppendValues(const ConfigValues& append) { 25 void ConfigValues::AppendValues(const ConfigValues& append) {
26 VectorAppend(&asmflags_, append.asmflags_); 26 VectorAppend(&asmflags_, append.asmflags_);
27 VectorAppend(&arflags_, append.arflags_);
27 VectorAppend(&cflags_, append.cflags_); 28 VectorAppend(&cflags_, append.cflags_);
28 VectorAppend(&cflags_c_, append.cflags_c_); 29 VectorAppend(&cflags_c_, append.cflags_c_);
29 VectorAppend(&cflags_cc_, append.cflags_cc_); 30 VectorAppend(&cflags_cc_, append.cflags_cc_);
30 VectorAppend(&cflags_objc_, append.cflags_objc_); 31 VectorAppend(&cflags_objc_, append.cflags_objc_);
31 VectorAppend(&cflags_objcc_, append.cflags_objcc_); 32 VectorAppend(&cflags_objcc_, append.cflags_objcc_);
32 VectorAppend(&defines_, append.defines_); 33 VectorAppend(&defines_, append.defines_);
33 VectorAppend(&include_dirs_, append.include_dirs_); 34 VectorAppend(&include_dirs_, append.include_dirs_);
34 VectorAppend(&ldflags_, append.ldflags_); 35 VectorAppend(&ldflags_, append.ldflags_);
35 VectorAppend(&lib_dirs_, append.lib_dirs_); 36 VectorAppend(&lib_dirs_, append.lib_dirs_);
36 VectorAppend(&libs_, append.libs_); 37 VectorAppend(&libs_, append.libs_);
37 38
38 // Only append precompiled header if there isn't one. It might be nice to 39 // Only append precompiled header if there isn't one. It might be nice to
39 // throw an error if there are conflicting precompiled headers, but that 40 // throw an error if there are conflicting precompiled headers, but that
40 // requires piping through some context of the actual configs involved, and 41 // requires piping through some context of the actual configs involved, and
41 // conflicts here should be very unusual. Instead, use the first value. 42 // conflicts here should be very unusual. Instead, use the first value.
42 if (!append.precompiled_header_.empty() && !precompiled_header_.empty()) 43 if (!append.precompiled_header_.empty() && !precompiled_header_.empty())
43 precompiled_header_ = append.precompiled_header_; 44 precompiled_header_ = append.precompiled_header_;
44 if (!append.precompiled_source_.is_null() && !precompiled_source_.is_null()) 45 if (!append.precompiled_source_.is_null() && !precompiled_source_.is_null())
45 precompiled_source_ = append.precompiled_source_; 46 precompiled_source_ = append.precompiled_source_;
46 } 47 }
OLDNEW
« no previous file with comments | « tools/gn/config_values.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698