Index: build/toolchain/nacl/BUILD.gn |
diff --git a/build/toolchain/nacl/BUILD.gn b/build/toolchain/nacl/BUILD.gn |
index a159118c0a028a42cdfa41f416cfeaf3890bc3b5..0060920aa97f145625ebe2cfba2efa530f59772f 100644 |
--- a/build/toolchain/nacl/BUILD.gn |
+++ b/build/toolchain/nacl/BUILD.gn |
@@ -28,7 +28,6 @@ nacl_arm_glibc_rev = revisions[1] |
#pnacl_newlib_rev = revisions[2] |
template("pnacl_toolchain") { |
- assert(defined(invoker.strip), "Must define strip") |
assert(defined(invoker.executable_extension), |
"Must define executable_extension") |
@@ -48,7 +47,9 @@ template("pnacl_toolchain") { |
cxx = toolprefix + "clang++" |
ar = toolprefix + "ar" |
ld = cxx |
- strip = toolprefix + invoker.strip |
+ if (defined(invoker.strip)) { |
+ strip = toolprefix + invoker.strip |
+ } |
executable_extension = invoker.executable_extension |
} |
} |
@@ -68,8 +69,9 @@ pnacl_toolchain("newlib_pnacl") { |
pnacl_toolchain("newlib_pnacl_nonsfi") { |
executable_extension = "" |
- |
- strip = "strip" |
+ # TODO(mcgrathr): Uncomment this after pnacl-strip has been taught |
+ # to grok --strip-unneeded. |
+ #strip = "strip" |
} |
template("nacl_glibc_toolchain") { |