diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-06-10 10:01:21 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-06-12 00:29:58 -0700 |
| commit | fa7b7bcdcbfe9dda7d0fa038bfe313c4d73ce810 (patch) | |
| tree | e06947f252716bd721facb15cf68105e44c94a51 | |
| parent | 46014c7b14d18cd2f5c0438e7bbcb8b08c5b228a (diff) | |
| download | rust-fa7b7bcdcbfe9dda7d0fa038bfe313c4d73ce810.tar.gz rust-fa7b7bcdcbfe9dda7d0fa038bfe313c4d73ce810.zip | |
mk: Allow using a locally compiled libuv.a
Closes #5563
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | mk/rt.mk | 27 |
2 files changed, 22 insertions, 9 deletions
diff --git a/configure b/configure index c68697f5389..fe29e488316 100755 --- a/configure +++ b/configure @@ -425,7 +425,8 @@ opt verify-install 1 "verify installed binaries work" valopt prefix "/usr/local" "set installation prefix" valopt local-rust-root "/usr/local" "set prefix for local rust binary" valopt llvm-root "" "set LLVM root" -valopt jemalloc-root "" "set jemalloc root" +valopt jemalloc-root "" "set directory where libjemalloc_pic.a is located" +valopt libuv-root "" "set directory where libuv.a is located" valopt android-cross-path "/opt/ndk_standalone" "Android NDK standalone path" valopt mingw32-cross-path "" "MinGW32 cross compiler path" @@ -1200,6 +1201,7 @@ putvar CFG_MINGW32_CROSS_PATH putvar CFG_MANDIR putvar CFG_DISABLE_INJECT_STD_VERSION putvar CFG_JEMALLOC_ROOT +putvar CFG_LIBUV_ROOT # Avoid spurious warnings from clang by feeding it original source on # ccache-miss rather than preprocessed input. diff --git a/mk/rt.mk b/mk/rt.mk index f865ef2ffaf..1c4efd641f0 100644 --- a/mk/rt.mk +++ b/mk/rt.mk @@ -204,19 +204,17 @@ $$(LIBUV_MAKEFILE_$(1)): $$(LIBUV_DEPS) $$(MKFILE_DEPS) $$(LIBUV_STAMP_$(1)) # theory when we support msvc then we should be using gyp's msvc output instead # of mingw's makefile for windows ifdef CFG_WINDOWSY_$(1) -$$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS) $$(MKFILE_DEPS) +LIBUV_LOCAL_$(1) := $$(S)src/libuv/libuv.a +$$(LIBUV_LOCAL_$(1)): $$(LIBUV_DEPS) $$(MKFILE_DEPS) $$(Q)$$(MAKE) -C $$(S)src/libuv -f Makefile.mingw \ LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS_$(1))" \ CC="$$(CC_$(1)) $$(LIBUV_CFLAGS_$(1)) $$(SNAP_DEFINES)" \ CXX="$$(CXX_$(1))" \ AR="$$(AR_$(1))" \ V=$$(VERBOSE) - $$(Q)cp $$(S)src/libuv/libuv.a $$@ else -$$(LIBUV_LIB_$(1)): $$(LIBUV_DIR_$(1))/Release/libuv.a $$(MKFILE_DEPS) - $$(Q)cp $$< $$@ -$$(LIBUV_DIR_$(1))/Release/libuv.a: $$(LIBUV_DEPS) $$(LIBUV_MAKEFILE_$(1)) \ - $$(MKFILE_DEPS) +LIBUV_LOCAL_$(1) := $$(LIBUV_DIR_$(1))/Release/libuv.a +$$(LIBUV_LOCAL_$(1)): $$(LIBUV_DEPS) $$(LIBUV_MAKEFILE_$(1)) $$(MKFILE_DEPS) $$(Q)$$(MAKE) -C $$(LIBUV_DIR_$(1)) \ CFLAGS="$$(LIBUV_CFLAGS_$(1)) $$(SNAP_DEFINES)" \ LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS_$(1))" \ @@ -231,6 +229,19 @@ $$(LIBUV_DIR_$(1))/Release/libuv.a: $$(LIBUV_DEPS) $$(LIBUV_MAKEFILE_$(1)) \ endif +ifeq ($(1),$$(CFG_BUILD)) +ifneq ($$(CFG_LIBUV_ROOT),) +$$(LIBUV_LIB_$(1)): $$(CFG_LIBUV_ROOT)/libuv.a + $$(Q)cp $$< $$@ +else +$$(LIBUV_LIB_$(1)): $$(LIBUV_LOCAL_$(1)) + $$(Q)cp $$< $$@ +endif +else +$$(LIBUV_LIB_$(1)): $$(LIBUV_LOCAL_$(1)) + $$(Q)cp $$< $$@ +endif + ################################################################################ # jemalloc ################################################################################ @@ -273,11 +284,11 @@ $$(JEMALLOC_LIB_$(1)): $$(CFG_JEMALLOC_ROOT)/libjemalloc_pic.a @$$(call E, copy: jemalloc) $$(Q)cp $$< $$@ else -$$(JEMALLOC_LIB_$(1)): +$$(JEMALLOC_LIB_$(1)): $$(JEMALLOC_LOCAL_$(1)) $$(Q)cp $$< $$@ endif else -$$(JEMALLOC_LIB_$(1)): +$$(JEMALLOC_LIB_$(1)): $$(JEMALLOC_LOCAL_$(1)) $$(Q)cp $$< $$@ endif |