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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tools/gn/ninja_helper.cc

Issue 21983003: Make the Mac build work. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 side-by-side diff with in-line comments
Download patch
« tools/gn/input_file.h ('K') | « tools/gn/ninja_build_writer.cc ('k') | tools/gn/ninja_target_writer.cc » ('j') | tools/gn/ninja_target_writer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/ninja_helper.cc
diff --git a/tools/gn/ninja_helper.cc b/tools/gn/ninja_helper.cc
index 65e06c08025cea806293c30ef62cd1f461731469..5e42dc8089bfe2cabd5931ca95ec24187d93373a 100644
--- a/tools/gn/ninja_helper.cc
+++ b/tools/gn/ninja_helper.cc
@@ -11,7 +11,7 @@
namespace {
-const char kLibDirWithSlash[] = "lib";
+const char kLibDirWithSlash[] = "lib/";
scottmg 2013/08/05 12:24:48 heh
const char kObjectDirNoSlash[] = "obj";
} // namespace
@@ -116,11 +116,11 @@ OutputFile NinjaHelper::GetTargetOutputFile(const Target* target) const {
// This is prepended to the output file name.
const char* prefix;
- if (target->settings()->IsWin()) {
- prefix = "";
- } else {
+ if (!target->settings()->IsWin() &&
+ target->output_type() == Target::SHARED_LIBRARY)
prefix = "lib";
- }
+ else
+ prefix = "";
const char* extension;
if (target->output_type() == Target::NONE ||
« tools/gn/input_file.h ('K') | « tools/gn/ninja_build_writer.cc ('k') | tools/gn/ninja_target_writer.cc » ('j') | tools/gn/ninja_target_writer.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698