Skip to content

Commit

Permalink
Revert "build: don't overwrite flags from BoardConfig"
Browse files Browse the repository at this point in the history 
 * Broke bionic build on multiarch.

This reverts commit 8a570fa.

Change-Id: I1bc3aa90d584ac7985ce48aabe6f1ca63f065899
  • Loading branch information
@moetayuko @LorDClockaN
moetayuko authored and LorDClockaN committed Aug 28, 2016
1 parent 9bd4349 commit 1e5e8fe
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions core/combo/select.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1e5e8fe

Please sign in to comment.