From 6a0a2633807ccb1e8b00f3899c6f89a083b556d1 Mon Sep 17 00:00:00 2001 From: Janet Anderson Date: Tue, 31 Aug 2010 11:33:37 -0500 Subject: [PATCH] Applied PATH_FILTER to input libraries on linker command line Now when using MSVC complier with non cygwin makes, RELEASE files can contain directories starting with forward slashes. bug:627511 --- configure/os/CONFIG.win32-x86.win32-x86 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure/os/CONFIG.win32-x86.win32-x86 b/configure/os/CONFIG.win32-x86.win32-x86 index 9acbf1b04..8d4dd4423 100644 --- a/configure/os/CONFIG.win32-x86.win32-x86 +++ b/configure/os/CONFIG.win32-x86.win32-x86 @@ -201,7 +201,7 @@ DLL_DEF_FLAG = $(addprefix /def:,$(wildcard ../$(addsuffix .def,$*))) # x.exp: what you need to build the dll (in no variable) # LINK.shrlib = $(WINLINK) /nologo $(WIN32_DLLFLAGS) /implib:$*.lib /out:$*.dll $(DLL_DEF_FLAG) -LINK.shrlib += $(LIBRARY_LD_OBJS) $(LIBRARY_LD_RESS) $(SHRLIB_LDLIBS) +LINK.shrlib += $(call PATH_FILTER, $(LIBRARY_LD_OBJS) $(LIBRARY_LD_RESS) $(SHRLIB_LDLIBS)) MUNCH_CMD = $(CCC) /Fo $@ $^ @@ -277,7 +277,7 @@ SHRLIB_LDLIBS += $(addsuffix .lib, \ #-------------------------------------------------- # Linker definition LINK.cpp = $(WINLINK) -nologo $(STATIC_LDFLAGS) $(LDFLAGS) $(PROD_LDFLAGS) -out:$@ \ - $(PROD_LD_OBJS) $(PROD_LD_RESS) $(PROD_LDLIBS) + $(call PATH_FILTER, $(PROD_LD_OBJS) $(PROD_LD_RESS) $(PROD_LDLIBS)) #-------------------------------------------------- # UseManifestTool.pl checks MS Visual c++ compiler version number to