Skip to content

Commit 305cece

Browse files
nikomatsakisbrson
authored andcommitted
pass proper options to libuv make
1 parent b578ed9 commit 305cece

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

mk/rt.mk

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
# fit the experimental data (i.e., I was able to get the system
2424
# working under these assumptions).
2525

26+
# Hack for passing flags into LIBUV, see below.
27+
LIBUV_FLAGS_i386 = -m32
28+
LIBUV_FLAGS_x86_64 = -m64
29+
2630
define DEF_RUNTIME_TARGETS
2731

2832
######################################################################
@@ -155,7 +159,8 @@ $$(LIBUV_LIB_$(1)): $$(wildcard \
155159
$$(S)src/rt/libuv/*/*/* \
156160
$$(S)src/rt/libuv/*/*/*/*)
157161
$$(Q)$$(MAKE) -C $$(S)mk/libuv/$$(LIBUV_ARCH_$(1))/$$(LIBUV_OSTYPE_$(1)) \
158-
CFLAGS="$$(TAR_CFLAGS)" LDFLAGS="-m32" \
162+
CFLAGS="$$(LIBUV_FLAGS_$$(HOST_$(1)))" \
163+
LDFLAGS="$$(LIBUV_FLAGS_$$(HOST_$(1)))" \
159164
CC="$$(CFG_GCCISH_CROSS)$$(CC)" \
160165
CXX="$$(CFG_GCCISH_CROSS)$$(CXX)" \
161166
AR="$$(CFG_GCCISH_CROSS)$$(AR)" \

0 commit comments

Comments
 (0)