Skip to content

Commit a38b166

Browse files
olsonjefferyKerra Olson
authored andcommitted
build: tweak rt.mk, as per graydon.. CFLAGS had to stay
1 parent dfcdb6e commit a38b166

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

mk/rt.mk

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -157,16 +157,17 @@ LIBUV_DEPS := $$(wildcard \
157157
$$(S)src/libuv/*/*/*/*)
158158
endif
159159

160+
ifdef CFG_WINDOWSY
161+
LIBUV_OS := 'OS=mingw'
162+
else
163+
LIBUV_OS :=
164+
endif
165+
160166
$$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS)
161167
$$(Q)$$(MAKE) -C $$(S)src/libuv/ \
162168
CFLAGS="$$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \
163-
LDFLAGS="$$(LIBUV_FLAGS_$$(HOST_$(1)))" \
164-
CC="$$(CFG_GCCISH_CROSS)$$(CC)" \
165-
CXX="$$(CFG_GCCISH_CROSS)$$(CXX)" \
166-
AR="$$(CFG_GCCISH_CROSS)$$(AR)" \
167-
BUILDTYPE=Release \
168-
builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/libuv" \
169-
V=$$(VERBOSE) FLOCK=
169+
builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/libuv" $$(LIBUV_OS) \
170+
V=$$(VERBOSE)
170171

171172
# These could go in rt.mk or rustllvm.mk, they're needed for both.
172173

0 commit comments

Comments
 (0)