wren: fix i686 build

This commit is contained in:
Butta 2020-08-10 01:52:00 +05:30 committed by buttaface
parent 5f0d8235a6
commit e61435943a
2 changed files with 22 additions and 3 deletions

View File

@ -8,9 +8,6 @@ TERMUX_PKG_BREAKS="wren-dev"
TERMUX_PKG_REPLACES="wren-dev" TERMUX_PKG_REPLACES="wren-dev"
TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_NO_STATICSPLIT=true TERMUX_PKG_NO_STATICSPLIT=true
# I can't reproduce it locally, but the interpreter fails to link on the Ubuntu
# CI for this arch, so disable for now.
TERMUX_PKG_BLACKLISTED_ARCHES="i686"
termux_step_make() { termux_step_make() {
local QUIET_BUILD= local QUIET_BUILD=

View File

@ -0,0 +1,22 @@
diff --git a/projects/make/wren_test.make b/projects/make/wren_test.make
index 6d8c6383..8309bf5b 100644
--- a/projects/make/wren_test.make
+++ b/projects/make/wren_test.make
@@ -40,7 +40,7 @@ ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -std=c99
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2
LIBS += ../../lib/libwren.a -lm
LDDEPS += ../../lib/libwren.a
-ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64 -s
+ALL_LDFLAGS += $(LDFLAGS) -m64 -s
else ifeq ($(config),release_32bit)
TARGETDIR = ../../bin
@@ -51,7 +51,7 @@ ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -std=c99
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2
LIBS += ../../lib/libwren.a -lm
LDDEPS += ../../lib/libwren.a
-ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32 -s
+ALL_LDFLAGS += $(LDFLAGS) -m32 -s
else ifeq ($(config),release_64bit-no-nan-tagging)
TARGETDIR = ../../bin