OLD | NEW |
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/ninja_binary_target_writer.h" | 5 #include "tools/gn/ninja_binary_target_writer.h" |
6 | 6 |
7 #include <cstring> | 7 #include <cstring> |
8 #include <set> | 8 #include <set> |
9 #include <sstream> | 9 #include <sstream> |
10 | 10 |
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
631 PathOutput::DIR_NO_LAST_SLASH); | 631 PathOutput::DIR_NO_LAST_SLASH); |
632 } | 632 } |
633 } | 633 } |
634 | 634 |
635 if (optional_def_file) { | 635 if (optional_def_file) { |
636 out_ << " /DEF:"; | 636 out_ << " /DEF:"; |
637 path_output_.WriteFile(out_, *optional_def_file); | 637 path_output_.WriteFile(out_, *optional_def_file); |
638 } | 638 } |
639 | 639 |
640 out_ << std::endl; | 640 out_ << std::endl; |
| 641 |
| 642 out_ << " arflags ="; |
| 643 RecursiveTargetConfigStringsToStream(target_, &ConfigValues::arflags, |
| 644 flag_options, out_); |
| 645 out_ << std::endl; |
641 } | 646 } |
642 | 647 |
643 void NinjaBinaryTargetWriter::WriteLibs() { | 648 void NinjaBinaryTargetWriter::WriteLibs() { |
644 out_ << " libs ="; | 649 out_ << " libs ="; |
645 | 650 |
646 // Libraries that have been recursively pushed through the dependency tree. | 651 // Libraries that have been recursively pushed through the dependency tree. |
647 EscapeOptions lib_escape_opts; | 652 EscapeOptions lib_escape_opts; |
648 lib_escape_opts.mode = ESCAPE_NINJA_COMMAND; | 653 lib_escape_opts.mode = ESCAPE_NINJA_COMMAND; |
649 const OrderedSet<std::string> all_libs = target_->all_libs(); | 654 const OrderedSet<std::string> all_libs = target_->all_libs(); |
650 const std::string framework_ending(".framework"); | 655 const std::string framework_ending(".framework"); |
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
817 "\n" | 822 "\n" |
818 "In the latter case, either rename one of the files or move one of\n" | 823 "In the latter case, either rename one of the files or move one of\n" |
819 "the sources to a separate source_set to avoid them both being in\n" | 824 "the sources to a separate source_set to avoid them both being in\n" |
820 "the same target."); | 825 "the same target."); |
821 g_scheduler->FailWithError(err); | 826 g_scheduler->FailWithError(err); |
822 return false; | 827 return false; |
823 } | 828 } |
824 } | 829 } |
825 return true; | 830 return true; |
826 } | 831 } |
OLD | NEW |