arch is ia32 in libuv, annoyingly. this should be changed.
This commit is contained in:
parent
20946e6970
commit
f0c1f999ac
8
mk/rt.mk
8
mk/rt.mk
|
@ -84,21 +84,21 @@ RUNTIME_HDR := rt/globals.h \
|
|||
|
||||
ifeq ($(CFG_WINDOWSY), 1)
|
||||
LIBUV_OSTYPE := win
|
||||
LIBUV_ARCH := i386
|
||||
LIBUV_ARCH := ia32
|
||||
LIBUV_LIB := rt/libuv/Default/obj.target/src/rt/libuv/libuv.a
|
||||
else ifeq ($(CFG_OSTYPE), apple-darwin)
|
||||
LIBUV_OSTYPE := mac
|
||||
LIBUV_ARCH := i386
|
||||
LIBUV_ARCH := ia32
|
||||
LIBUV_LIB := rt/libuv/Default/libuv.a
|
||||
else
|
||||
LIBUV_OSTYPE := unix
|
||||
LIBUV_ARCH := i386
|
||||
LIBUV_ARCH := ia32
|
||||
LIBUV_LIB := rt/libuv/Default/obj.target/src/rt/libuv/libuv.a
|
||||
endif
|
||||
|
||||
RUNTIME_DEF := rt/rustrt$(CFG_DEF_SUFFIX)
|
||||
RUNTIME_INCS := -I $(S)src/rt/isaac -I $(S)src/rt/uthash \
|
||||
-I $(S)src/rt/arch/x86_64 \
|
||||
-I $(S)src/rt/arch/i386 \
|
||||
-I $(S)src/rt/libuv/include
|
||||
RUNTIME_OBJS := $(RUNTIME_CS:.cpp=.o) $(RUNTIME_LL:.ll=.o) $(RUNTIME_S:.S=.o)
|
||||
RUNTIME_LIBS := $(LIBUV_LIB)
|
||||
|
|
Loading…
Reference in New Issue