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

Unified Diff: tools/gn/ninja_binary_target_writer.cc

Issue 1431323003: Remove obsolete OS handling in GN. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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/ninja_action_target_writer_unittest.cc ('k') | tools/gn/ninja_binary_target_writer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/ninja_binary_target_writer.cc
diff --git a/tools/gn/ninja_binary_target_writer.cc b/tools/gn/ninja_binary_target_writer.cc
index 64bf04236e078dc1d04ecb64dcd5faf1b5c92c13..98c6f1d40771c65d8d1214e9c572a379ffc5e7da 100644
--- a/tools/gn/ninja_binary_target_writer.cc
+++ b/tools/gn/ninja_binary_target_writer.cc
@@ -860,10 +860,9 @@ void NinjaBinaryTargetWriter::WriteLibs() {
const OrderedSet<std::string> all_libs = target_->all_libs();
const std::string framework_ending(".framework");
for (size_t i = 0; i < all_libs.size(); i++) {
- if (settings_->IsMac() &&
- base::EndsWith(all_libs[i], framework_ending,
+ if (base::EndsWith(all_libs[i], framework_ending,
base::CompareCase::INSENSITIVE_ASCII)) {
- // Special-case libraries ending in ".framework" on Mac. Add the
+ // Special-case libraries ending in ".framework" to support Mac: Add the
// -framework switch and don't add the extension to the output.
out_ << " -framework ";
EscapeStringToStream(out_,
« no previous file with comments | « tools/gn/ninja_action_target_writer_unittest.cc ('k') | tools/gn/ninja_binary_target_writer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698