native_client_sdk/src/build_tools/make_rules.py - Issue 10820058: Fix bad merge in a244177

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: native_client_sdk/src/build_tools/make_rules.py

Issue 10820058: Fix bad merge in a244177 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 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:

Index: native_client_sdk/src/build_tools/make_rules.py

diff --git a/native_client_sdk/src/build_tools/make_rules.py b/native_client_sdk/src/build_tools/make_rules.py

index a7d4158017a54007c3478c346d3af466b46bcef4..6ab4d804edeab77605f3159196607f44ae67f77b 100755

--- a/native_client_sdk/src/build_tools/make_rules.py

+++ b/native_client_sdk/src/build_tools/make_rules.py

@@ -32,8 +32,8 @@ PNACL_CC?=$(TC_PATH)/$(OSNAME)_x86_pnacl/newlib/bin/pnacl-clang -c

PNACL_CXX?=$(TC_PATH)/$(OSNAME)_x86_pnacl/newlib/bin/pnacl-clang++ -c -std=gnu++98

PNACL_LINK?=$(TC_PATH)/$(OSNAME)_x86_pnacl/newlib/bin/pnacl-clang++

PNACL_DUMP?=$(TC_PATH)/$(OSNAME)_x86_pnacl/newlib/bin/objdump

-PNACL_CCFLAGS?=-O0 -g -pthread $(NACL_WARNINGS)

PNACL_CCFLAGS?=-O0 -MMD -g -pthread $(NACL_WARNINGS)

+PNACL_LDFLAGS?=-g -pthread

TRANSLATE:=$(TC_PATH)/$(OSNAME)_x86_pnacl/newlib/bin/pnacl-translate

"""

« no previous file with comments | « no previous file | no next file » | no next file with comments »