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

Commit 7dd8ec17 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

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

This reverts commit e27b214f.

Change-Id: I3d739c0594dbe4ecd62c5b07064ada7de6cdaadb
parent e27b214f

core/combo/HOST_linux-x86.mk

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

  -no-canonical-prefixes \

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

  -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=2 -fstack-protector

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





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

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

# See bug 12708004.

# See bug 12708004.

core/combo/HOST_linux-x86_64.mk

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

  -no-canonical-prefixes \

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

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





# TODO: Set _FORTIFY_SOURCE=2. Bug 20558757.

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

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





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

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

# See bug 12708004.

# See bug 12708004.