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`.
This commit is contained in:
parent
deff2f50a9
commit
6fee2690cf
|
@ -6,7 +6,7 @@ CPP_x86_64-pc-windows-msvc="$(CFG_MSVC_CL)" -nologo
|
||||||
AR_x86_64-pc-windows-msvc="$(CFG_MSVC_LIB)" -nologo
|
AR_x86_64-pc-windows-msvc="$(CFG_MSVC_LIB)" -nologo
|
||||||
CFG_LIB_NAME_x86_64-pc-windows-msvc=$(1).dll
|
CFG_LIB_NAME_x86_64-pc-windows-msvc=$(1).dll
|
||||||
CFG_STATIC_LIB_NAME_x86_64-pc-windows-msvc=$(1).lib
|
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_LIB_DSYM_GLOB_x86_64-pc-windows-msvc=$(1)-*.dylib.dSYM
|
||||||
CFG_JEMALLOC_CFLAGS_x86_64-pc-windows-msvc :=
|
CFG_JEMALLOC_CFLAGS_x86_64-pc-windows-msvc :=
|
||||||
CFG_GCCISH_CFLAGS_x86_64-pc-windows-msvc := -MD
|
CFG_GCCISH_CFLAGS_x86_64-pc-windows-msvc := -MD
|
||||||
|
|
|
@ -63,7 +63,7 @@ define PREPARE_LIB
|
||||||
echo " at destination $(PREPARE_WORKING_DEST_LIB_DIR):" && \
|
echo " at destination $(PREPARE_WORKING_DEST_LIB_DIR):" && \
|
||||||
echo $$MATCHES ; \
|
echo $$MATCHES ; \
|
||||||
fi
|
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
|
endef
|
||||||
|
|
||||||
# Copy a man page
|
# Copy a man page
|
||||||
|
|
Loading…
Reference in New Issue