diff options
| author | mcgrathr <mcgrathr@chromium.org> | 2015-10-09 14:23:02 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-09 21:23:50 +0000 |
| commit | 0b9de3622acdbc1fba625094b369090f65145b78 (patch) | |
| tree | 198fec83c66d9ee3c06c28ffb482a72f2a8d8882 /ppapi | |
| parent | 0fb1401e650b5aec91d9fef4d3b42598ddff13f4 (diff) | |
| download | chromium_src-0b9de3622acdbc1fba625094b369090f65145b78.zip chromium_src-0b9de3622acdbc1fba625094b369090f65145b78.tar.gz chromium_src-0b9de3622acdbc1fba625094b369090f65145b78.tar.bz2 | |
GN: Fix NaCl IRT build options
The NaCl IRT is a special case and needs to be built with specific
code-generation and optimization options (we also always want debug
symbols). This plumbs through an is_nacl_irt variable that configs
can test, and uses that to make the standard configs do the right
thing. The resulting compiler and linker flags are a close
approximation of what GYP uses.
BUG= 531702
R=dpranke@chromium.org, dschuff@chromium.org
Review URL: https://codereview.chromium.org/1397953002
Cr-Commit-Position: refs/heads/master@{#353385}
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/BUILD.gn | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/ppapi/BUILD.gn b/ppapi/BUILD.gn index 6023bbf..fa0d2f1 100644 --- a/ppapi/BUILD.gn +++ b/ppapi/BUILD.gn @@ -264,17 +264,19 @@ if (enable_nacl) { # The CPU names used in tests/ppapi_nacl_tests_newlib.nmf # are the ones used in GYP (x32 for x86). - if (target_cpu == "x86") { - nmf_cpu = "x32" - } else if (current_cpu != "pnacl") { - nmf_cpu = target_cpu - } - if (is_nacl_glibc) { - suffix = "glibc_${nmf_cpu}" - } else if (current_cpu == "pnacl") { + if (current_cpu == "pnacl") { suffix = "pnacl" } else { - suffix = "newlib_${nmf_cpu}" + if (target_cpu == "x86") { + nmf_cpu = "x32" + } else if (current_cpu != "pnacl") { + nmf_cpu = target_cpu + } + if (is_nacl_glibc) { + suffix = "glibc_${nmf_cpu}" + } else { + suffix = "newlib_${nmf_cpu}" + } } outputs = [ "${root_build_dir}/{{source_name_part}}_${suffix}.nexe", |