diff options
| author | jvoung@chromium.org <jvoung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-18 00:42:00 +0000 |
|---|---|---|
| committer | jvoung@chromium.org <jvoung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-18 00:42:00 +0000 |
| commit | 367c6ff86346828b2c974210f8408b48bd3f0a10 (patch) | |
| tree | 1a90d411f971dd441309233587fd46389d28ac8a /native_client_sdk/doc_generated | |
| parent | 9948c9f203848a591c8be31755bc07abdd349d23 (diff) | |
| download | chromium_src-367c6ff86346828b2c974210f8408b48bd3f0a10.zip chromium_src-367c6ff86346828b2c974210f8408b48bd3f0a10.tar.gz chromium_src-367c6ff86346828b2c974210f8408b48bd3f0a10.tar.bz2 | |
NaClSDK: Fix LINK+STRIP make rules to only apply to Release or PNaCl.
Otherwise CONFIG=Debug also ends up with a stripped nexe.
Also update the gonacl demo Makefiles and the docs to match.
BUG=364220
NOTRY=true
(NaCl SDK change only)
Review URL: https://codereview.chromium.org/241753002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264691 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk/doc_generated')
| -rw-r--r-- | native_client_sdk/doc_generated/devguide/tutorial/tutorial-part2.html | 12 |
1 files changed, 8 insertions, 4 deletions
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 45fea11..ab9550b 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’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 |