tools/gn/ninja_helper.cc - Issue 21983003: Make the Mac build work.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: dunnow Created 7 years, 4 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:

Index: tools/gn/ninja_helper.cc

diff --git a/tools/gn/ninja_helper.cc b/tools/gn/ninja_helper.cc

index 65e06c08025cea806293c30ef62cd1f461731469..c3d275bc51e73aa1bf831f9ce43d59548bc5e11a 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/";

const char kObjectDirNoSlash[] = "obj";

} // namespace

@@ -116,7 +116,8 @@ OutputFile NinjaHelper::GetTargetOutputFile(const Target* target) const {

// This is prepended to the output file name.

const char* prefix;

- if (target->settings()->IsWin()) {

+ if (target->settings()->IsWin() ||

+ target->output_type() == Target::EXECUTABLE) {

prefix = "";

} else {

prefix = "lib";

« no previous file with comments | « tools/gn/ninja_build_writer.cc ('k') | tools/gn/ninja_target_writer.cc » ('j') | no next file with comments »