NaClSDK: Fix LINK+STRIP make rules to only apply to Release or PNaCl.

native_client_sdk/src/doc/devguide/tutorial/tutorial-part2.rst

 .. _tutorial2:
 
 ######################################
 C++ Tutorial: Getting Started (Part 2)
 ######################################
 
 .. contents::
   :local:
   :backlinks: none
   :depth: 2
@@ skipping 51 matching lines @@
     TARGET = part2
     LIBS = ppapi_cpp ppapi
 
     CFLAGS = -Wall
     SOURCES = hello_tutorial.cc
 
     # Build rules generated by macros from common.mk:
 
     $(foreach src,$(SOURCES),$(eval $(call COMPILE_RULE,$(src),$(CFLAGS))))
 
-    ifeq ($(CONFIG),Release)
+    # The PNaCl workflow uses both an unstripped and finalized/stripped binary.
+    # Or, only produce a stripped binary for Release configurations (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
     $(eval $(call LINK_RULE,$(TARGET),$(SOURCES),$(LIBS),$(DEPS)))
     endif
 
     $(eval $(call NMF_RULE,$(TARGET),))
 
 Choosing valid toolchains, and including common.mk
 --------------------------------------------------
@@ skipping 92 matching lines @@
 Build macros
 ------------
 
 For many projects, the following build macros do not need to be changed; they
 will use the variables we've defined above.
 
 .. naclcode::
 
     $(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
     $(eval $(call LINK_RULE,$(TARGET),$(SOURCES),$(LIBS),$(DEPS)))
     endif
 
     $(eval $(call NMF_RULE,$(TARGET),))
 
 The first line defines rules to compile each source in ``SOURCES``, using the
 flags in ``CFLAGS``:
 
 .. naclcode::
 
     $(foreach src,$(SOURCES),$(eval $(call COMPILE_RULE,$(src),$(CFLAGS))))
 
 The next six lines define rules to link the object files into one or more
 executables. When ``TOOLCHAIN`` is ``pnacl``, there is only one executable
 generated: in the example above, ``part2.pexe``. When using a NaCl toolchain,
 there will be three executables generated, one for each architecture: in the
 example above, ``part2_arm.nexe``, ``part2_x86_32.nexe`` and
 ``part2_x86_64.nexe``.
 
 When ``CONFIG`` is ``Release``, each executable is also stripped to remove
-debug information and reduce the file size:
+debug information and reduce the file size. Otherwise, when the ``TOOLCHAIN``
+is ``pnacl``, the workflow involves creating an unstripped binary for debugging
+and then finalizing it and stripping it for publishing.
 
 .. naclcode::
 
-    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
     $(eval $(call LINK_RULE,$(TARGET),$(SOURCES),$(LIBS),$(DEPS)))
     endif
 
 Finally, the NMF rule generates a NaCl manifest file (``.nmf``) that references
 each executable generated in the previous step:
 
 .. naclcode::
@@ skipping 263 matching lines @@
       // postMessage sends a message to it.
       common.naclModule.postMessage('hello');
     }
 
     // This function is called by common.js when a message is received from the
     // NaCl module.
     function handleMessage(message) {
       var logEl = document.getElementById('log');
       logEl.textContent += message.data;
     }