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

Commit e68ec719 authored by Ying Wang's avatar Ying Wang
Browse files

[DO NOT MERGE] Workaround to fix klp-modular-dev-plus-aosp build. 

Change-Id: I8042b045f20b870de84ea7c4c060c3cbe1cdfe69
parent 3be473bd

core/combo/TARGET_linux-arm.mk

+2 −4
Original line number Diff line number Diff line
@@ -245,8 +245,7 @@ $(hide) $(PRIVATE_CXX) \ 
	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

	$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \

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

	$(PRIVATE_LDLIBS)

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O))

endef



define $(combo_2nd_arch_prefix)transform-o-to-executable-inner
@@ -272,8 +271,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ 
	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

	$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \

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

	$(PRIVATE_LDLIBS)

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))

endef



define $(combo_2nd_arch_prefix)transform-o-to-static-executable-inner

core/combo/TARGET_linux-mips.mk

+2 −4
Original line number Diff line number Diff line
@@ -236,8 +236,7 @@ $(hide) $(PRIVATE_CXX) \ 
	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

	$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \

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

	$(PRIVATE_LDLIBS)

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O))

endef



define $(combo_2nd_arch_prefix)transform-o-to-executable-inner
@@ -263,8 +262,7 @@ $(hide) $(PRIVATE_CXX) -nostdlib -Bdynamic -fPIE -pie \ 
	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

	$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \

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

	$(PRIVATE_LDLIBS)

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))

endef



define $(combo_2nd_arch_prefix)transform-o-to-static-executable-inner

core/combo/TARGET_linux-x86.mk

+2 −4
Original line number Diff line number Diff line
@@ -199,8 +199,7 @@ $(hide) $(PRIVATE_CXX) \ 
	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

	$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \

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

	$(PRIVATE_LDLIBS)

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_SO_O))

endef



define $(combo_2nd_arch_prefix)transform-o-to-executable-inner
@@ -226,8 +225,7 @@ $(hide) $(PRIVATE_CXX) \ 
	$(PRIVATE_LDFLAGS) \

	$(PRIVATE_TARGET_LIBATOMIC) \

	$(if $(PRIVATE_LIBCXX),,$(PRIVATE_TARGET_LIBGCC)) \

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

	$(PRIVATE_LDLIBS)

	$(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O))

endef



define $(combo_2nd_arch_prefix)transform-o-to-static-executable-inner