Skip to content

Commit 0da58cc

Browse files
committed
Auto merge of #26226 - alexcrichton:fix-msvc-dist, r=brson
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`.
2 parents 7648776 + 6fee269 commit 0da58cc

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

mk/cfg/x86_64-pc-windows-msvc.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ CPP_x86_64-pc-windows-msvc="$(CFG_MSVC_CL)" -nologo
66
AR_x86_64-pc-windows-msvc="$(CFG_MSVC_LIB)" -nologo
77
CFG_LIB_NAME_x86_64-pc-windows-msvc=$(1).dll
88
CFG_STATIC_LIB_NAME_x86_64-pc-windows-msvc=$(1).lib
9-
CFG_LIB_GLOB_x86_64-pc-windows-msvc=$(1)-*.dll
9+
CFG_LIB_GLOB_x86_64-pc-windows-msvc=$(1)-*.{dll,lib}
1010
CFG_LIB_DSYM_GLOB_x86_64-pc-windows-msvc=$(1)-*.dylib.dSYM
1111
CFG_JEMALLOC_CFLAGS_x86_64-pc-windows-msvc :=
1212
CFG_GCCISH_CFLAGS_x86_64-pc-windows-msvc := -MD

mk/prepare.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ define PREPARE_LIB
6363
echo " at destination $(PREPARE_WORKING_DEST_LIB_DIR):" && \
6464
echo $$MATCHES ; \
6565
fi
66-
$(Q)$(PREPARE_LIB_CMD) `ls -drt1 $(PREPARE_WORKING_SOURCE_LIB_DIR)/$(1) | tail -1` $(PREPARE_WORKING_DEST_LIB_DIR)/
66+
$(Q)$(PREPARE_LIB_CMD) `ls -drt1 $(PREPARE_WORKING_SOURCE_LIB_DIR)/$(1)` $(PREPARE_WORKING_DEST_LIB_DIR)/
6767
endef
6868

6969
# Copy a man page

0 commit comments

Comments
 (0)