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

Commit 6d5dd236 authored by Stephen Hines's avatar Stephen Hines
Browse files

Fix incorrect x86 build rules. 

combo/TARGET_x86*.mk mistakenly added TARGET_GLOBAL_CFLAGS to their
linker command lines. This results in clang builds not working properly,
since they strip some unknown flags from TARGET_GLOBAL_CFLAGS.

Change-Id: I60a1ff5df70305323134435e4ae107ea7acfe8ea
parent 5c7039fb

core/clang/TARGET_x86.mk

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
include $(BUILD_SYSTEM)/clang/x86.mk



CLANG_CONFIG_x86_TARGET_TRIPLE := i686-linux-android

# NOTE: There is no i686-linux-android prebuilt, so we must hardcode the

# x86_64 target instead.

CLANG_CONFIG_x86_TARGET_TOOLCHAIN_PREFIX := \

  $($(clang_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/x86_64-linux-android/bin

core/combo/TARGET_linux-x86.mk

100755 → 100644
+0 −1
Original line number Diff line number Diff line
@@ -182,7 +182,6 @@ $(hide) $(PRIVATE_CXX) \ 
	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	 -nostdlib -Wl,-soname,$(notdir $@) \

	 -shared -Bsymbolic \

	$(TARGET_GLOBAL_CFLAGS) \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \

	$(PRIVATE_ALL_OBJECTS) \

core/combo/TARGET_linux-x86_64.mk

100755 → 100644
+0 −1
Original line number Diff line number Diff line
@@ -188,7 +188,6 @@ $(hide) $(PRIVATE_CXX) \ 
	$(PRIVATE_TARGET_GLOBAL_LDFLAGS) \

	 -nostdlib -Wl,-soname,$(notdir $@) \

	 -shared -Bsymbolic \

	$(TARGET_GLOBAL_CFLAGS) \

	$(PRIVATE_TARGET_GLOBAL_LD_DIRS) \

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTBEGIN_SO_O)) \

	$(PRIVATE_ALL_OBJECTS) \