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

Commit 051e28fe authored by Stephen Hines's avatar Stephen Hines Committed by Gerrit Code Review
Browse files

Merge "Fix incorrect x86 build rules."

parents a9baf879 6d5dd236

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) \