diff options
| author | Dan Fess <dfess@google.com> | 2024-02-16 03:53:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-16 03:53:13 +0000 |
| commit | 00ea0452f657e3d4a8d377c3d2601e1916634bfe (patch) | |
| tree | 43b4fee164e40544c118fd9a217258a066700c6e | |
| parent | aeb31d3f9d832df229b4d39138471ad72901b47f (diff) | |
| parent | e839de6796ad6161249d9bac9c83909b90aa53fc (diff) | |
| download | trusty-00ea0452f657e3d4a8d377c3d2601e1916634bfe.tar.gz | |
host tools: move user-specified compile flags am: e839de6796
Original change: https://android-review.googlesource.com/c/trusty/lk/trusty/+/2816055
Change-Id: I35c8b8eb6c052c4e570727aa53aee4688299ee05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | make/host_lib.mk | 2 | ||||
| -rw-r--r-- | make/host_test.mk | 2 | ||||
| -rw-r--r-- | make/host_tool.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/make/host_lib.mk b/make/host_lib.mk index df12a3c..e13703b 100644 --- a/make/host_lib.mk +++ b/make/host_lib.mk @@ -54,7 +54,7 @@ HEADER_GUARD_HOST_LIB_$(BUILDDIR)_$(HOST_LIB_NAME):=1 GENERIC_CC := $(HOST_CC) GENERIC_SRCS := $(HOST_LIB_SRCS) GENERIC_OBJ_DIR := $(BUILDDIR)/host_libs/obj/$(HOST_LIB_NAME) -GENERIC_FLAGS := $(HOST_LIB_FLAGS) -O1 -g -Wall -Wextra -Wno-unused-parameter -Werror $(HOST_SANITIZER_FLAGS) $(addprefix -I, $(HOST_INCLUDE_DIRS)) +GENERIC_FLAGS := -O1 -g -Wall -Wextra -Wno-unused-parameter -Werror $(HOST_SANITIZER_FLAGS) $(HOST_LIB_FLAGS) $(addprefix -I, $(HOST_INCLUDE_DIRS)) GENERIC_CFLAGS := -std=c11 -D_POSIX_C_SOURCE=200809 -Wno-missing-field-initializers GENERIC_CPPFLAGS := -std=c++17 $(HOST_LIBCXX_CPPFLAGS) include make/generic_compile.mk diff --git a/make/host_test.mk b/make/host_test.mk index 3a7e166..b87d7bd 100644 --- a/make/host_test.mk +++ b/make/host_test.mk @@ -84,7 +84,7 @@ $(foreach t,$(HOST_DEPS),\ GENERIC_CC := $(HOST_CC) GENERIC_SRCS := $(HOST_SRCS) GENERIC_OBJ_DIR := $(HOST_TEST_BUILDDIR)/host_tests/obj/$(HOST_TEST) -GENERIC_FLAGS := $(addprefix -I, $(HOST_INCLUDE_DIRS)) $(HOST_FLAGS) -O1 -g -Wall -Wextra -Wno-unused-parameter -Werror $(HOST_SANITIZER_FLAGS) +GENERIC_FLAGS := -O1 -g -Wall -Wextra -Wno-unused-parameter -Werror $(HOST_SANITIZER_FLAGS) $(HOST_FLAGS) $(addprefix -I, $(HOST_INCLUDE_DIRS)) GENERIC_CFLAGS := -std=c11 -D_POSIX_C_SOURCE=200809 -Wno-missing-field-initializers GENERIC_CPPFLAGS := -std=c++17 -Wno-c99-designator $(HOST_LIBCXX_CPPFLAGS) include make/generic_compile.mk diff --git a/make/host_tool.mk b/make/host_tool.mk index 9ef90f3..560dcc7 100644 --- a/make/host_tool.mk +++ b/make/host_tool.mk @@ -87,7 +87,7 @@ include $(addsuffix /rules.mk, $(HOST_DEPS)) GENERIC_CC := $(HOST_CC) GENERIC_SRCS := $(HOST_SRCS) GENERIC_OBJ_DIR := $(BUILDDIR)/host_tools/obj/$(HOST_TOOL_NAME) -GENERIC_FLAGS := $(addprefix -I, $(HOST_INCLUDE_DIRS)) $(HOST_FLAGS) -O1 -g -Wall -Wextra -Wno-unused-parameter -Werror $(HOST_SANITIZER_FLAGS) +GENERIC_FLAGS := -O1 -g -Wall -Wextra -Wno-unused-parameter -Werror $(HOST_SANITIZER_FLAGS) $(HOST_FLAGS) $(addprefix -I, $(HOST_INCLUDE_DIRS)) GENERIC_CFLAGS := -std=c11 -D_POSIX_C_SOURCE=200809 -Wno-missing-field-initializers GENERIC_CPPFLAGS := -std=c++17 $(HOST_LIBCXX_CPPFLAGS) GENERIC_SRCDEPS := $(HOST_SRCDEPS) |