diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-06-11 13:50:56 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-06-11 14:15:36 -0700 |
| commit | 6fee2690cfa2a6ab29caa4c2f635e7daf21c0ecb (patch) | |
| tree | e77ddb680f66babc5381c21a25f8b456d4518152 | |
| parent | deff2f50a97342c8b2f92a124ded2d2ead7b2996 (diff) | |
| download | rust-6fee2690cfa2a6ab29caa4c2f635e7daf21c0ecb.tar.gz rust-6fee2690cfa2a6ab29caa4c2f635e7daf21c0ecb.zip | |
mk: Tweak the LIB_GLOB for MSVC
Right now the distribution tarball for MSVC only includes the *.dll files for the supporting libraries, but not the corresponding *.lib files which allow actually linking to the dll. This means that the current MSVC nightlies cannot produce dynamically linked binaries as the *.lib files are not available to link against. This commit modifies the `LIB_GLOB` used to copy the files around to include the `lib` variant of the `dll`.
| -rw-r--r-- | mk/cfg/x86_64-pc-windows-msvc.mk | 2 | ||||
| -rw-r--r-- | mk/prepare.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mk/cfg/x86_64-pc-windows-msvc.mk b/mk/cfg/x86_64-pc-windows-msvc.mk index c718c19d366..69a26c03fb6 100644 --- a/mk/cfg/x86_64-pc-windows-msvc.mk +++ b/mk/cfg/x86_64-pc-windows-msvc.mk @@ -6,7 +6,7 @@ CPP_x86_64-pc-windows-msvc="$(CFG_MSVC_CL)" -nologo AR_x86_64-pc-windows-msvc="$(CFG_MSVC_LIB)" -nologo CFG_LIB_NAME_x86_64-pc-windows-msvc=$(1).dll CFG_STATIC_LIB_NAME_x86_64-pc-windows-msvc=$(1).lib -CFG_LIB_GLOB_x86_64-pc-windows-msvc=$(1)-*.dll +CFG_LIB_GLOB_x86_64-pc-windows-msvc=$(1)-*.{dll,lib} CFG_LIB_DSYM_GLOB_x86_64-pc-windows-msvc=$(1)-*.dylib.dSYM CFG_JEMALLOC_CFLAGS_x86_64-pc-windows-msvc := CFG_GCCISH_CFLAGS_x86_64-pc-windows-msvc := -MD diff --git a/mk/prepare.mk b/mk/prepare.mk index 573b7ac79fd..2e8e309a7bb 100644 --- a/mk/prepare.mk +++ b/mk/prepare.mk @@ -63,7 +63,7 @@ define PREPARE_LIB echo " at destination $(PREPARE_WORKING_DEST_LIB_DIR):" && \ echo $$MATCHES ; \ fi - $(Q)$(PREPARE_LIB_CMD) `ls -drt1 $(PREPARE_WORKING_SOURCE_LIB_DIR)/$(1) | tail -1` $(PREPARE_WORKING_DEST_LIB_DIR)/ + $(Q)$(PREPARE_LIB_CMD) `ls -drt1 $(PREPARE_WORKING_SOURCE_LIB_DIR)/$(1)` $(PREPARE_WORKING_DEST_LIB_DIR)/ endef # Copy a man page |