Asm compiler flags need to behind the common c flags.
Bug: 273862399
Test: local build
Change-Id: Iab44a71eaaf6bfc5afcf8938f04dbcd100132a0a
diff --git a/cc_toolchain_features.bzl b/cc_toolchain_features.bzl
index c095a3a..16e0451 100644
--- a/cc_toolchain_features.bzl
+++ b/cc_toolchain_features.bzl
@@ -345,50 +345,6 @@
],
))
- features.append(feature(
- name = "asm_compiler_flags",
- enabled = True,
- flag_sets = [
- flag_set(
- actions = _actions.assemble,
- flag_groups = [
- flag_group(
- flags = asm_only_flags,
- ),
- ],
- ),
- ],
- ))
- features.append(feature(
- name = "cpp_compiler_flags",
- enabled = True,
- flag_sets = [
- flag_set(
- actions = [_actions.cpp_compile],
- flag_groups = [
- flag_group(
- flags = cpp_only_flags,
- ),
- ],
- ),
- ],
- ))
- if c_only_flags:
- features.append(feature(
- name = "c_compiler_flags",
- enabled = True,
- flag_sets = [
- flag_set(
- actions = [_actions.c_compile],
- flag_groups = [
- flag_group(
- flags = c_only_flags,
- ),
- ],
- ),
- ],
- ))
-
if target_arch == _arches.Arm:
features.append(feature(
name = "arm_isa_arm",
@@ -442,6 +398,52 @@
))
features.append(feature(
+ name = "asm_compiler_flags",
+ enabled = True,
+ flag_sets = [
+ flag_set(
+ actions = _actions.assemble,
+ flag_groups = [
+ flag_group(
+ flags = asm_only_flags,
+ ),
+ ],
+ ),
+ ],
+ ))
+
+ features.append(feature(
+ name = "cpp_compiler_flags",
+ enabled = True,
+ flag_sets = [
+ flag_set(
+ actions = [_actions.cpp_compile],
+ flag_groups = [
+ flag_group(
+ flags = cpp_only_flags,
+ ),
+ ],
+ ),
+ ],
+ ))
+
+ if c_only_flags:
+ features.append(feature(
+ name = "c_compiler_flags",
+ enabled = True,
+ flag_sets = [
+ flag_set(
+ actions = [_actions.c_compile],
+ flag_groups = [
+ flag_group(
+ flags = c_only_flags,
+ ),
+ ],
+ ),
+ ],
+ ))
+
+ features.append(feature(
name = "external_compiler_flags",
enabled = True,
flag_sets = [