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

Commit 5adb7cb1 authored by Dan Willemsen's avatar Dan Willemsen Committed by Android Git Automerger
Browse files

am 30dc4d25: am 04df6551: am b6a3ede5: Merge "Remove trailing / for HOST_TOOLCHAIN_FOR_CLANG" 

* commit '30dc4d25':
  Remove trailing / for HOST_TOOLCHAIN_FOR_CLANG
parents 1758c0c2 30dc4d25

core/combo/HOST_linux-x86.mk

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ $(combo_2nd_arch_prefix)HOST_CXX := $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PRE 
$(combo_2nd_arch_prefix)HOST_AR  := $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PREFIX)ar



# gcc location for clang; to be updated when clang is updated

$(combo_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG := prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8/

$(combo_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG := prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8



# We expect SSE3 floating point math.

$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -msse3 -mfpmath=sse -m32 -Wa,--noexecstack -march=prescott

core/combo/HOST_linux-x86_64.mk

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ HOST_CXX := $(HOST_TOOLCHAIN_PREFIX)g++ 
HOST_AR  := $(HOST_TOOLCHAIN_PREFIX)ar



# gcc location for clang; to be updated when clang is updated

HOST_TOOLCHAIN_FOR_CLANG := prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8/

HOST_TOOLCHAIN_FOR_CLANG := prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.15-4.8



HOST_GLOBAL_CFLAGS += -m64 -Wa,--noexecstack

HOST_GLOBAL_LDFLAGS += -m64 -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now