Commit a1a12ef3 authored by John Barboza's avatar John Barboza Committed by Commit Bot

fix gn builds on aix

Introduces `is_aix` variable and suppress non-virtual-dtor warning.

Change-Id: Iab0ceee2309d96b1efcb09fadc710362159da752
Reviewed-on: https://chromium-review.googlesource.com/1103535Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Reviewed-by: default avatarMichael Achenbach <machenbach@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#574143}
parent 667f20ab
...@@ -291,6 +291,7 @@ if (custom_toolchain != "") { ...@@ -291,6 +291,7 @@ if (custom_toolchain != "") {
# current_os value directly. # current_os value directly.
if (current_os == "win" || current_os == "winuwp") { if (current_os == "win" || current_os == "winuwp") {
is_aix = false
is_android = false is_android = false
is_chromeos = false is_chromeos = false
is_fuchsia = false is_fuchsia = false
...@@ -301,6 +302,7 @@ if (current_os == "win" || current_os == "winuwp") { ...@@ -301,6 +302,7 @@ if (current_os == "win" || current_os == "winuwp") {
is_posix = false is_posix = false
is_win = true is_win = true
} else if (current_os == "mac") { } else if (current_os == "mac") {
is_aix = false
is_android = false is_android = false
is_chromeos = false is_chromeos = false
is_fuchsia = false is_fuchsia = false
...@@ -311,6 +313,7 @@ if (current_os == "win" || current_os == "winuwp") { ...@@ -311,6 +313,7 @@ if (current_os == "win" || current_os == "winuwp") {
is_posix = true is_posix = true
is_win = false is_win = false
} else if (current_os == "android") { } else if (current_os == "android") {
is_aix = false
is_android = true is_android = true
is_chromeos = false is_chromeos = false
is_fuchsia = false is_fuchsia = false
...@@ -321,6 +324,7 @@ if (current_os == "win" || current_os == "winuwp") { ...@@ -321,6 +324,7 @@ if (current_os == "win" || current_os == "winuwp") {
is_posix = true is_posix = true
is_win = false is_win = false
} else if (current_os == "chromeos") { } else if (current_os == "chromeos") {
is_aix = false
is_android = false is_android = false
is_chromeos = true is_chromeos = true
is_fuchsia = false is_fuchsia = false
...@@ -334,6 +338,7 @@ if (current_os == "win" || current_os == "winuwp") { ...@@ -334,6 +338,7 @@ if (current_os == "win" || current_os == "winuwp") {
# current_os == "nacl" will be passed by the nacl toolchain definition. # current_os == "nacl" will be passed by the nacl toolchain definition.
# It is not set by default or on the command line. We treat is as a # It is not set by default or on the command line. We treat is as a
# Posix variant. # Posix variant.
is_aix = false
is_android = false is_android = false
is_chromeos = false is_chromeos = false
is_fuchsia = false is_fuchsia = false
...@@ -344,6 +349,7 @@ if (current_os == "win" || current_os == "winuwp") { ...@@ -344,6 +349,7 @@ if (current_os == "win" || current_os == "winuwp") {
is_posix = true is_posix = true
is_win = false is_win = false
} else if (current_os == "fuchsia") { } else if (current_os == "fuchsia") {
is_aix = false
is_android = false is_android = false
is_chromeos = false is_chromeos = false
is_fuchsia = true is_fuchsia = true
...@@ -354,6 +360,7 @@ if (current_os == "win" || current_os == "winuwp") { ...@@ -354,6 +360,7 @@ if (current_os == "win" || current_os == "winuwp") {
is_posix = false is_posix = false
is_win = false is_win = false
} else if (current_os == "ios") { } else if (current_os == "ios") {
is_aix = false
is_android = false is_android = false
is_chromeos = false is_chromeos = false
is_fuchsia = false is_fuchsia = false
...@@ -364,6 +371,7 @@ if (current_os == "win" || current_os == "winuwp") { ...@@ -364,6 +371,7 @@ if (current_os == "win" || current_os == "winuwp") {
is_posix = true is_posix = true
is_win = false is_win = false
} else if (current_os == "linux") { } else if (current_os == "linux") {
is_aix = false
is_android = false is_android = false
is_chromeos = false is_chromeos = false
is_fuchsia = false is_fuchsia = false
...@@ -374,6 +382,7 @@ if (current_os == "win" || current_os == "winuwp") { ...@@ -374,6 +382,7 @@ if (current_os == "win" || current_os == "winuwp") {
is_posix = true is_posix = true
is_win = false is_win = false
} else if (current_os == "aix") { } else if (current_os == "aix") {
is_aix = true
is_android = false is_android = false
is_chromeos = false is_chromeos = false
is_fuchsia = false is_fuchsia = false
......
...@@ -39,7 +39,7 @@ config("compiler") { ...@@ -39,7 +39,7 @@ config("compiler") {
"-fno-rtti", "-fno-rtti",
"-fno-exceptions", "-fno-exceptions",
"-Wno-narrowing", "-Wno-narrowing",
"-Wnon-virtual-dtor", "-Wno-non-virtual-dtor",
] ]
ldflags = [ ldflags = [
......
...@@ -920,6 +920,8 @@ class MetaBuildWrapper(object): ...@@ -920,6 +920,8 @@ class MetaBuildWrapper(object):
subdir, exe = 'linux64', 'gn' subdir, exe = 'linux64', 'gn'
elif self.platform == 'darwin': elif self.platform == 'darwin':
subdir, exe = 'mac', 'gn' subdir, exe = 'mac', 'gn'
elif self.platform == 'aix6':
subdir, exe = 'aix', 'gn'
else: else:
subdir, exe = 'win', 'gn.exe' subdir, exe = 'win', 'gn.exe'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment