| Index: build/config/BUILDCONFIG.gn
|
| diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
|
| index 10d9d3fb189ed8f756ac51f13813eaa4807ed887..16495470cae54d88b9d9edb535819431627d00dc 100644
|
| --- a/build/config/BUILDCONFIG.gn
|
| +++ b/build/config/BUILDCONFIG.gn
|
| @@ -156,6 +156,7 @@ declare_args() {
|
| if (current_os == "win") {
|
| is_android = false
|
| is_chromeos = false
|
| + is_fnl = false
|
| is_ios = false
|
| is_linux = false
|
| is_mac = false
|
| @@ -165,6 +166,7 @@ if (current_os == "win") {
|
| } else if (current_os == "mac") {
|
| is_android = false
|
| is_chromeos = false
|
| + is_fnl = false
|
| is_ios = false
|
| is_linux = false
|
| is_mac = true
|
| @@ -174,6 +176,7 @@ if (current_os == "win") {
|
| } else if (current_os == "android") {
|
| is_android = true
|
| is_chromeos = false
|
| + is_fnl = false
|
| is_ios = false
|
| is_linux = false
|
| is_mac = false
|
| @@ -183,6 +186,7 @@ if (current_os == "win") {
|
| } else if (current_os == "chromeos") {
|
| is_android = false
|
| is_chromeos = true
|
| + is_fnl = false
|
| is_ios = false
|
| is_linux = true
|
| is_mac = false
|
| @@ -195,6 +199,7 @@ if (current_os == "win") {
|
| # Posix variant.
|
| is_android = false
|
| is_chromeos = false
|
| + is_fnl = false
|
| is_ios = false
|
| is_linux = false
|
| is_mac = false
|
| @@ -204,6 +209,7 @@ if (current_os == "win") {
|
| } else if (current_os == "ios") {
|
| is_android = false
|
| is_chromeos = false
|
| + is_fnl = false
|
| is_ios = true
|
| is_linux = false
|
| is_mac = false
|
| @@ -213,6 +219,17 @@ if (current_os == "win") {
|
| } else if (current_os == "linux") {
|
| is_android = false
|
| is_chromeos = false
|
| + is_fnl = false
|
| + is_ios = false
|
| + is_linux = true
|
| + is_mac = false
|
| + is_nacl = false
|
| + is_posix = true
|
| + is_win = false
|
| +} else if (current_os == "fnl") {
|
| + is_android = false
|
| + is_chromeos = false
|
| + is_fnl = true
|
| is_ios = false
|
| is_linux = true
|
| is_mac = false
|
| @@ -380,7 +397,9 @@ if (is_posix) {
|
| ]
|
| }
|
|
|
| -if (is_linux) {
|
| +if (is_fnl) {
|
| + _native_compiler_configs += [ "//build/config/fnl:sdk" ]
|
| +} else if (is_linux) {
|
| _native_compiler_configs += [ "//build/config/linux:sdk" ]
|
| } else if (is_mac) {
|
| _native_compiler_configs += [ "//build/config/mac:sdk" ]
|
| @@ -554,6 +573,9 @@ if (is_win) {
|
| if (is_chromeos && cros_use_custom_toolchain) {
|
| set_default_toolchain("//build/toolchain/cros:target")
|
| }
|
| + if (is_fnl) {
|
| + set_default_toolchain("//build/toolchain/fnl:target")
|
| + }
|
| } else if (is_mac) {
|
| host_toolchain = "//build/toolchain/mac:clang_x64"
|
| set_default_toolchain(host_toolchain)
|
|
|