diff options
| author | Jeff Olson <olson.jeffery@gmail.com> | 2013-02-02 12:14:04 -0800 |
|---|---|---|
| committer | Kerra Olson <kerra@mbp.local> | 2013-02-10 11:51:05 -0800 |
| commit | a74296a39fe9988516dde322a61374c65fc86b25 (patch) | |
| tree | 3a5b5a03d68eae6b858e5e610ed281216a4bc092 | |
| parent | 4942fe9c1e92ae90878910337011507b07073975 (diff) | |
| download | rust-a74296a39fe9988516dde322a61374c65fc86b25.tar.gz rust-a74296a39fe9988516dde322a61374c65fc86b25.zip | |
build: ifdef for mingw/non-mingw builds
| -rw-r--r-- | mk/rt.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/mk/rt.mk b/mk/rt.mk index eed5615f82a..23dc64dbca5 100644 --- a/mk/rt.mk +++ b/mk/rt.mk @@ -158,16 +158,19 @@ LIBUV_DEPS := $$(wildcard \ endif ifdef CFG_WINDOWSY -LIBUV_OS := 'OS=mingw' +$$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS) + $$(Q)$$(MAKE) -C $$(S)src/libuv/ \ + builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/libuv" \ + OS=mingw \ + V=$$(VERBOSE) else -LIBUV_OS := -endif - $$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS) $$(Q)$$(MAKE) -C $$(S)src/libuv/ \ CFLAGS="$$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \ - builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/libuv" $$(LIBUV_OS) \ + builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/libuv" \ V=$$(VERBOSE) +endif + # These could go in rt.mk or rustllvm.mk, they're needed for both. |