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

Commit 0dac6788 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Revert "Revert "Turn on _FORTIFY_SOURCE=2 for the host."""

parents 1d8e8c96 7dd8ec17

core/combo/HOST_linux-x86.mk

+1 −2
Original line number Diff line number Diff line
@@ -40,8 +40,7 @@ $(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -fPIC \ 
  -no-canonical-prefixes \

  -include $(call select-android-config-h,linux-x86)



# TODO: Set _FORTIFY_SOURCE=2. Bug 20558757.

$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 -fstack-protector

$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector



# Workaround differences in inttypes.h between host and target.

# See bug 12708004.

core/combo/HOST_linux-x86_64.mk

+1 −2
Original line number Diff line number Diff line
@@ -40,8 +40,7 @@ HOST_GLOBAL_CFLAGS += -fPIC \ 
  -no-canonical-prefixes \

  -include $(call select-android-config-h,linux-x86)



# TODO: Set _FORTIFY_SOURCE=2. Bug 20558757.

HOST_GLOBAL_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 -fstack-protector

HOST_GLOBAL_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector



# Workaround differences in inttypes.h between host and target.

# See bug 12708004.