Commit e9c4eeb 1 parent 5268669 commit e9c4eeb Copy full SHA for e9c4eeb
File tree 11 files changed +30
-15
lines changed
11 files changed +30
-15
lines changed Original file line number Diff line number Diff line change 3
3
# found in the LICENSE file.
4
4
5
5
import (" //build/toolchain/clang.gni" )
6
+ import (" //build/toolchain/toolchain.gni" )
6
7
import (" clang.gni" )
7
8
8
9
# Empty entry to satisfy ANGLE build, which tries to remove this config.
@@ -26,10 +27,10 @@ config("extra_warnings") {
26
27
27
28
group (" llvm-symbolizer_data" ) {
28
29
if (is_win ) {
29
- data = [ " //buildtools /windows-x64/bin/llvm-symbolizer.exe" ]
30
+ data = [ " $buildtools_path /windows-x64/bin/llvm-symbolizer.exe" ]
30
31
} else if (is_mac ) {
31
- data = [ " //buildtools /mac-${ host_cpu } /clang/bin/llvm-symbolizer" ]
32
+ data = [ " $buildtools_path /mac-${ host_cpu } /clang/bin/llvm-symbolizer" ]
32
33
} else if (is_linux ) {
33
- data = [ " //buildtools /linux-${ host_cpu } /clang/bin/llvm-symbolizer" ]
34
+ data = [ " $buildtools_path /linux-${ host_cpu } /clang/bin/llvm-symbolizer" ]
34
35
}
35
36
}
Original file line number Diff line number Diff line change @@ -20,6 +20,7 @@ import("//build/config/sanitizers/sanitizers.gni")
20
20
import (" //build/fuchsia/config.gni" )
21
21
import (" //build/toolchain/ccache.gni" )
22
22
import (" //build/toolchain/clang.gni" )
23
+ import (" //build/toolchain/toolchain.gni" )
23
24
import (" //build/toolchain/wasm.gni" )
24
25
25
26
declare_args () {
@@ -152,8 +153,8 @@ config("compiler") {
152
153
if (use_custom_libcxx ) {
153
154
cflags_cc += [ " -nostdinc++" ]
154
155
include_dirs = [
155
- " //buildtools /third_party/libc++/trunk/include" ,
156
- " //buildtools /third_party/libc++abi/trunk/include" ,
156
+ " $buildtools_path /third_party/libc++/trunk/include" ,
157
+ " $buildtools_path /third_party/libc++abi/trunk/include" ,
157
158
]
158
159
}
159
160
}
Original file line number Diff line number Diff line change 4
4
5
5
import (" //build/config/c++/c++.gni" )
6
6
import (" //build/config/sanitizers/sanitizers.gni" )
7
+ import (" //build/toolchain/toolchain.gni" )
7
8
8
9
# Contains the dependencies needed for sanitizers to link into executables and
9
10
# shared_libraries. Unconditionally depend upon this target as it is empty if
@@ -14,7 +15,7 @@ group("deps") {
14
15
deps += [ " :options_sources" ]
15
16
}
16
17
if (use_custom_libcxx ) {
17
- deps += [ " //buildtools /third_party/libc++:libcxx_proxy" ]
18
+ deps += [ " $buildtools_path /third_party/libc++:libcxx_proxy" ]
18
19
}
19
20
}
20
21
Original file line number Diff line number Diff line change 3
3
# found in the LICENSE file.
4
4
5
5
import (" //build/fuchsia/config.gni" )
6
+ import (" //build/toolchain/toolchain.gni" )
6
7
7
8
declare_args () {
8
9
# The path to where GN targets derived from the Fuchsia SDK are instantiated.
@@ -17,7 +18,7 @@ declare_args() {
17
18
18
19
# The following variables are Flutter buildroot specific.
19
20
fuchsia_sdk_path = " //fuchsia/sdk/$host_os "
20
- fuchsia_toolchain_path = " //buildtools /${ host_os } -${ host_cpu } /clang"
21
+ fuchsia_toolchain_path = " $buildtools_path /${ host_os } -${ host_cpu } /clang"
21
22
}
22
23
23
24
declare_args () {
Original file line number Diff line number Diff line change @@ -8,6 +8,7 @@ import("//build/toolchain/clang.gni")
8
8
import (" //build/toolchain/gcc_toolchain.gni" )
9
9
import (" //build/toolchain/goma.gni" )
10
10
import (" //build/toolchain/rbe.gni" )
11
+ import (" //build/toolchain/toolchain.gni" )
11
12
12
13
# The Android GCC toolchains share most of the same parameters, so we have this
13
14
# wrapper around gcc_toolchain to avoid duplication of logic.
@@ -69,7 +70,7 @@ template("android_toolchain") {
69
70
assert (false , " Unknown host" )
70
71
}
71
72
72
- prefix = rebase_path (" //buildtools /$host_dir /clang/bin" , root_build_dir )
73
+ prefix = rebase_path (" $buildtools_path /$host_dir /clang/bin" , root_build_dir )
73
74
74
75
cc = " ${ compiler_prefix } ${ prefix } /clang"
75
76
cxx = " ${ compiler_prefix } ${ prefix } /clang++"
Original file line number Diff line number Diff line change 4
4
5
5
import (" //build/toolchain/clang.gni" )
6
6
import (" //build/toolchain/goma.gni" )
7
+ import (" //build/toolchain/toolchain.gni" )
7
8
8
9
if (use_goma ) {
9
10
goma_prefix = " $goma_dir /gomacc "
@@ -15,7 +16,7 @@ toolchain("fuchsia") {
15
16
assert (target_cpu == " x64" || target_cpu == " arm64" ,
16
17
" We currently only support 'x64' and 'arm64' targets for fuchsia." )
17
18
toolchain_bin =
18
- rebase_path (" //buildtools /${ host_os } -${ host_cpu } /clang/bin" , root_out_dir )
19
+ rebase_path (" $buildtools_path /${ host_os } -${ host_cpu } /clang/bin" , root_out_dir )
19
20
fuchsia_sdk = rebase_path (" //fuchsia/sdk/$host_os " , root_out_dir )
20
21
21
22
# We can't do string interpolation ($ in strings) on things with dots in
Original file line number Diff line number Diff line change @@ -7,6 +7,7 @@ import("//build/toolchain/ccache.gni")
7
7
import (" //build/toolchain/gcc_toolchain.gni" )
8
8
import (" //build/toolchain/goma.gni" )
9
9
import (" //build/toolchain/rbe.gni" )
10
+ import (" //build/toolchain/toolchain.gni" )
10
11
11
12
declare_args () {
12
13
toolchain_prefix = " "
@@ -33,10 +34,10 @@ if (use_goma) {
33
34
34
35
if (host_cpu == " arm64" ) {
35
36
rebased_clang_dir =
36
- rebase_path (" //buildtools /linux-arm64/clang/bin" , root_build_dir )
37
+ rebase_path (" $buildtools_path /linux-arm64/clang/bin" , root_build_dir )
37
38
} else {
38
39
rebased_clang_dir =
39
- rebase_path (" //buildtools /linux-x64/clang/bin" , root_build_dir )
40
+ rebase_path (" $buildtools_path /linux-x64/clang/bin" , root_build_dir )
40
41
}
41
42
42
43
gcc_toolchain (" arm" ) {
Original file line number Diff line number Diff line change @@ -11,14 +11,15 @@ import("//build/toolchain/clang.gni")
11
11
import (" //build/toolchain/clang_static_analyzer.gni" )
12
12
import (" //build/toolchain/goma.gni" )
13
13
import (" //build/toolchain/rbe.gni" )
14
+ import (" //build/toolchain/toolchain.gni" )
14
15
15
16
# Goma doesn't support the host-arm64 toolchain, so continue using Rosetta.
16
17
if (host_cpu == " arm64" && ! use_goma ) {
17
18
rebased_clang_dir =
18
- rebase_path (" //buildtools /mac-arm64/clang/bin" , root_build_dir )
19
+ rebase_path (" $buildtools_path /mac-arm64/clang/bin" , root_build_dir )
19
20
} else {
20
21
rebased_clang_dir =
21
- rebase_path (" //buildtools /mac-x64/clang/bin" , root_build_dir )
22
+ rebase_path (" $buildtools_path /mac-x64/clang/bin" , root_build_dir )
22
23
}
23
24
24
25
if (use_goma ) {
Original file line number Diff line number Diff line change 4
4
5
5
# Defines the configuration of RBE.
6
6
7
+ import (" //build/toolchain/toolchain.gni" )
8
+
7
9
declare_args () {
8
10
# Set to true to enable distributed compilation using Goma.
9
11
use_rbe = false
@@ -31,7 +33,7 @@ declare_args() {
31
33
32
34
rbe_platform = " "
33
35
34
- rbe_dir = rebase_path (" //buildtools /linux-x64/reclient" )
36
+ rbe_dir = rebase_path (" $buildtools_path /linux-x64/reclient" )
35
37
36
38
rbe_cfg = rebase_path (" //flutter/build/rbe/rewrapper-linux.cfg" )
37
39
}
Original file line number Diff line number Diff line change 2
2
# Use of this source code is governed by a BSD-style license that can be
3
3
# found in the LICENSE file.
4
4
5
+ declare_args () {
6
+ buildtools_path = " //buildtools"
7
+ }
8
+
5
9
use_xcode_clang = false
Original file line number Diff line number Diff line change 3
3
# found in the LICENSE file.
4
4
5
5
import (" //build/toolchain/rbe.gni" )
6
+ import (" //build/toolchain/toolchain.gni" )
6
7
import (" //build/toolchain/win/win_toolchain_data.gni" )
7
8
8
- default_clang_base_path = " //buildtools /windows-x64/clang"
9
+ default_clang_base_path = " $buildtools_path /windows-x64/clang"
9
10
10
11
declare_args () {
11
12
# Path to the directory containing the VC binaries for the right
You can’t perform that action at this time.
0 commit comments