Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 995b7dde authored by dianlujitao's avatar dianlujitao Committed by Steve Kondik
Browse files

Revert "build: don't overwrite flags from BoardConfig" 

 * Broke bionic build on multiarch.

This reverts commit 8a570fa1.

Change-Id: I1bc3aa90d584ac7985ce48aabe6f1ca63f065899
parent 7956b224

core/combo/select.mk

+6 −6
Original line number Diff line number Diff line
@@ -33,12 +33,12 @@ $(combo_var_prefix)CXX := $(CXX) 
$(combo_var_prefix)AR := $(AR)

$(combo_var_prefix)STRIP := $(STRIP)



$(combo_var_prefix)GLOBAL_CFLAGS += -fno-exceptions -Wno-multichar

$(combo_var_prefix)RELEASE_CFLAGS += -O2 -g -fno-strict-aliasing

$(combo_var_prefix)GLOBAL_CPPFLAGS +=

$(combo_var_prefix)GLOBAL_LDFLAGS +=

$(combo_var_prefix)GLOBAL_ARFLAGS += crsPD

$(combo_var_prefix)GLOBAL_LD_DIRS +=

$(combo_var_prefix)GLOBAL_CFLAGS := -fno-exceptions -Wno-multichar

$(combo_var_prefix)RELEASE_CFLAGS := -O2 -g -fno-strict-aliasing

$(combo_var_prefix)GLOBAL_CPPFLAGS :=

$(combo_var_prefix)GLOBAL_LDFLAGS :=

$(combo_var_prefix)GLOBAL_ARFLAGS := crsPD

$(combo_var_prefix)GLOBAL_LD_DIRS :=



$(combo_var_prefix)EXECUTABLE_SUFFIX :=

$(combo_var_prefix)SHLIB_SUFFIX := .so