commit 13556c40c3a95b39bd5e74df01f33b079906729d
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 25 19:07:48 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 25 19:07:48 2023 +0000
tree 9dde81e157e3c7c795ceb90e6509637001986456
parent 738531af2504c171d6f65524c4320ea379ca1fb1
parent deaf24812dbbd5740b623c283f17e381561c76ea

Merge "Add GLOBAL_CLANG_CFLAGS_64_NO_OVERRIDE support to Make"

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 6320726..6f1d814 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -58,6 +58,9 @@
 my_cppflags := $(LOCAL_CPPFLAGS)
 my_cflags_no_override := $(GLOBAL_CLANG_CFLAGS_NO_OVERRIDE)
 my_cppflags_no_override := $(GLOBAL_CLANG_CPPFLAGS_NO_OVERRIDE)
+ifeq ($(my_32_64_bit_suffix), 64)
+  my_cflags_no_override += $(GLOBAL_CLANG_CFLAGS_64_NO_OVERRIDE)
+endif
 ifdef is_third_party
     my_cflags_no_override += $(GLOBAL_CLANG_EXTERNAL_CFLAGS_NO_OVERRIDE)
     my_cppflags_no_override += $(GLOBAL_CLANG_EXTERNAL_CFLAGS_NO_OVERRIDE)