Skip to content

Commit f5b97fc

Browse files
committed
gn: Change flag --system-cxx to --no-system-cxx
1 parent 3808b19 commit f5b97fc

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ jobs:
5858
--target-cpu ${{ matrix.arch }} \
5959
--target-toolchain /usr/lib/llvm-12 \
6060
--target-sysroot src/sysroot-6.0/${{ matrix.arch }} \
61-
--system-cxx \
6261
--target-dir build
6362
ninja -C src/out/build
6463
@@ -69,7 +68,7 @@ jobs:
6968
--target-cpu ${{ matrix.arch }} \
7069
--target-toolchain /usr/lib/llvm-12 \
7170
--target-sysroot src/sysroot-6.5/${{ matrix.arch }} \
72-
--api-version 6.5 --system-cxx \
71+
--api-version 6.5 \
7372
--target-dir build
7473
ninja -C src/out/build
7574

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ The Flutter embedder for Tizen.
5858
### Notes
5959

6060
- To build an app (TPK) with the embedder generated in the above, copy the output artifacts (`libflutter_tizen*.so`) into the [flutter-tizen](https://github.com/flutter-tizen/flutter-tizen) tool's cached artifacts directory (`flutter/bin/cache/artifacts/engine`) and run `flutter-tizen run` or `flutter-tizen build tpk`.
61-
- To use the target device's `libstdc++.so` instead of the embedder's built-in libc++ (`third_party/libcxx`), provide the `--system-cxx` option to `tools/gn`.
61+
- To use the embedder's built-in libc++ (`third_party/libcxx`) instead of the target device's `libstdc++.so`, provide the `--no-system-cxx` option to `tools/gn`.
6262
- Building NUI-related code requires a sysroot for Tizen 6.5 or above and the `--api-version 6.5` option.
6363

6464
## Repository structure

build/config/BUILDCONFIG.gn

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,22 @@ declare_args() {
3030
api_version = ""
3131

3232
# Use the system libstdc++ without building third_party/libcxx from source.
33-
use_system_cxx = false
33+
no_system_cxx = false
3434
}
3535

3636
_default_configs = [
3737
"//build/config:compiler",
3838
"//build/config:cxx_version_default",
3939
]
4040

41-
if (use_system_cxx) {
42-
_default_configs += [ "//build/config:system_cxx" ]
43-
} else {
41+
if (no_system_cxx) {
4442
_default_configs += [
4543
"//build/config:no_system_cxx",
4644
"//third_party/libcxxabi:libcxxabi_config",
4745
"//third_party/libcxx:libcxx_config",
4846
]
47+
} else {
48+
_default_configs += [ "//build/config:system_cxx" ]
4949
}
5050

5151
if (is_unopt) {
@@ -60,7 +60,7 @@ set_defaults("executable") {
6060
configs = _executable_configs
6161
deps = []
6262

63-
if (!use_system_cxx) {
63+
if (no_system_cxx) {
6464
deps += [ "//third_party/libcxx" ]
6565
}
6666
}
@@ -74,7 +74,7 @@ set_defaults("shared_library") {
7474
configs = _executable_configs
7575
deps = []
7676

77-
if (!use_system_cxx) {
77+
if (no_system_cxx) {
7878
deps += [ "//third_party/libcxx" ]
7979
}
8080
}

tools/gn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def to_gn_args(args):
7575

7676
gn_args['clang_version'] = get_clang_version(args.target_toolchain)
7777
gn_args['api_version'] = args.api_version
78-
gn_args['use_system_cxx'] = args.system_cxx
78+
gn_args['no_system_cxx'] = args.no_system_cxx
7979

8080
for key, val in gn_args.items():
8181
if isinstance(val, bool):
@@ -101,7 +101,7 @@ def parse_args(args):
101101
parser.add_argument('--target-sysroot', type=str)
102102

103103
parser.add_argument('--api-version', default='6.0', type=str)
104-
parser.add_argument('--system-cxx', default=False, action='store_true')
104+
parser.add_argument('--no-system-cxx', default=False, action='store_true')
105105

106106
parser.add_argument('--target-dir', type=str)
107107
parser.add_argument('--verbose', default=False, action='store_true')

0 commit comments

Comments
 (0)