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

Unified Diff: native_client_sdk/doc_generated/devguide/tutorial/tutorial-part2.html

Issue 241753002: NaClSDK: Fix LINK+STRIP make rules to only apply to Release or PNaCl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update comment Created 6 years, 8 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
« no previous file with comments | « no previous file | native_client_sdk/src/doc/devguide/tutorial/tutorial-part2.rst » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: native_client_sdk/doc_generated/devguide/tutorial/tutorial-part2.html
diff --git a/native_client_sdk/doc_generated/devguide/tutorial/tutorial-part2.html b/native_client_sdk/doc_generated/devguide/tutorial/tutorial-part2.html
index 45fea11dfaff699202dd87a38a98ff4629a1fc65..ab9550b916ea6260b35b85deab4ae733565ff2d7 100644
--- a/native_client_sdk/doc_generated/devguide/tutorial/tutorial-part2.html
+++ b/native_client_sdk/doc_generated/devguide/tutorial/tutorial-part2.html
@@ -76,7 +76,9 @@ SOURCES = hello_tutorial.cc
$(foreach src,$(SOURCES),$(eval $(call COMPILE_RULE,$(src),$(CFLAGS))))
-ifeq ($(CONFIG),Release)
+# The PNaCl workflow uses both an unstripped and finalized/stripped binary.
+# On NaCl, only produce a stripped binary for Release configs (not Debug).
+ifneq (,$(or $(findstring pnacl,$(TOOLCHAIN)),$(findstring Release,$(CONFIG))))
$(eval $(call LINK_RULE,$(TARGET)_unstripped,$(SOURCES),$(LIBS),$(DEPS)))
$(eval $(call STRIP_RULE,$(TARGET),$(TARGET)_unstripped))
else
@@ -168,7 +170,7 @@ will use the variables we&#8217;ve defined above.</p>
<pre class="prettyprint">
$(foreach src,$(SOURCES),$(eval $(call COMPILE_RULE,$(src),$(CFLAGS))))
-ifeq ($(CONFIG),Release)
+ifneq (,$(or $(findstring pnacl,$(TOOLCHAIN)),$(findstring Release,$(CONFIG))))
$(eval $(call LINK_RULE,$(TARGET)_unstripped,$(SOURCES),$(LIBS),$(DEPS)))
$(eval $(call STRIP_RULE,$(TARGET),$(TARGET)_unstripped))
else
@@ -189,9 +191,11 @@ there will be three executables generated, one for each architecture: in the
example above, <code>part2_arm.nexe</code>, <code>part2_x86_32.nexe</code> and
<code>part2_x86_64.nexe</code>.</p>
<p>When <code>CONFIG</code> is <code>Release</code>, each executable is also stripped to remove
-debug information and reduce the file size:</p>
+debug information and reduce the file size. Otherwise, when the <code>TOOLCHAIN</code>
+is <code>pnacl</code>, the workflow involves creating an unstripped binary for debugging
+and then finalizing it and stripping it for publishing.</p>
<pre class="prettyprint">
-ifeq ($(CONFIG),Release)
+ifneq (,$(or $(findstring pnacl,$(TOOLCHAIN)),$(findstring Release,$(CONFIG))))
$(eval $(call LINK_RULE,$(TARGET)_unstripped,$(SOURCES),$(LIBS),$(DEPS)))
$(eval $(call STRIP_RULE,$(TARGET),$(TARGET)_unstripped))
else
« no previous file with comments | « no previous file | native_client_sdk/src/doc/devguide/tutorial/tutorial-part2.rst » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698