add $installarchlib/CORE to default linker search path on windows

p4raw-id: //depot/perl@4230

diff --git a/win32/Makefile b/win32/Makefile
index f700ada..9dd104e 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -223,8 +223,22 @@ CFG                = Optimize
 !ENDIF
 !ENDIF
 
+ARCHDIR                = ..\lib\$(ARCHNAME)
 COREDIR                = ..\lib\CORE
 AUTODIR                = ..\lib\auto
+LIBDIR         = ..\lib
+EXTDIR         = ..\ext
+PODDIR         = ..\pod
+EXTUTILSDIR    = $(LIBDIR)\ExtUtils
+
+#
+INST_SCRIPT    = $(INST_TOP)$(INST_VER)\bin
+INST_BIN       = $(INST_SCRIPT)$(INST_ARCH)
+INST_LIB       = $(INST_TOP)$(INST_VER)\lib
+INST_ARCHLIB   = $(INST_LIB)$(INST_ARCH)
+INST_COREDIR   = $(INST_ARCHLIB)\CORE
+INST_POD       = $(INST_LIB)\pod
+INST_HTML      = $(INST_POD)\html
 
 #
 # Programs to compile, build .lib files and link
@@ -300,7 +314,9 @@ LIBFILES    = $(LIBBASEFILES) $(LIBC)
 
 CFLAGS         = -nologo -Gf -W3 $(INCLUDES) $(DEFINES) $(LOCDEFS) \
                $(PCHFLAGS) $(OPTIMIZE)
-LINK_FLAGS     = -nologo -nodefaultlib $(LINK_DBG) -machine:$(PROCESSOR_ARCHITECTURE)
+LINK_FLAGS     = -nologo -nodefaultlib $(LINK_DBG) \
+               -libpath:"$(INST_COREDIR)" \
+               -machine:$(PROCESSOR_ARCHITECTURE)
 OBJOUT_FLAG    = -Fo
 EXEOUT_FLAG    = -Fe
 
@@ -328,17 +344,6 @@ $(o).dll:
            -out:$@ $(LINK_FLAGS) $(LIBFILES) $< $(LIBPERL)  
 
 #
-INST_BIN       = $(INST_TOP)$(INST_VER)\bin$(INST_ARCH)
-INST_SCRIPT    = $(INST_TOP)$(INST_VER)\bin
-INST_LIB       = $(INST_TOP)$(INST_VER)\lib
-INST_POD       = $(INST_LIB)\pod
-INST_HTML      = $(INST_POD)\html
-LIBDIR         = ..\lib
-EXTDIR         = ..\ext
-PODDIR         = ..\pod
-EXTUTILSDIR    = $(LIBDIR)\extutils
-
-#
 # various targets
 !IF "$(USE_OBJECT)" == "define"
 PERLIMPLIB     = ..\perl56.lib

diff --git a/win32/makefile.mk b/win32/makefile.mk
index 23dde72..4c73009 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -229,8 +229,22 @@ DELAYLOAD  *= -DELAYLOAD:wsock32.dll delayimp.lib
 CFG            *= Optimize
 .ENDIF
 
+ARCHDIR                = ..\lib\$(ARCHNAME)
 COREDIR                = ..\lib\CORE
 AUTODIR                = ..\lib\auto
+LIBDIR         = ..\lib
+EXTDIR         = ..\ext
+PODDIR         = ..\pod
+EXTUTILSDIR    = $(LIBDIR)\ExtUtils
+
+#
+INST_SCRIPT    = $(INST_TOP)$(INST_VER)\bin
+INST_BIN       = $(INST_SCRIPT)$(INST_ARCH)
+INST_LIB       = $(INST_TOP)$(INST_VER)\lib
+INST_ARCHLIB   = $(INST_LIB)$(INST_ARCH)
+INST_COREDIR   = $(INST_ARCHLIB)\CORE
+INST_POD       = $(INST_LIB)\pod
+INST_HTML      = $(INST_POD)\html
 
 #
 # Programs to compile, build .lib files and link
@@ -269,7 +283,7 @@ LINK_DBG    =
 
 CFLAGS         = -w -g0 -tWM -tWD $(INCLUDES) $(DEFINES) $(LOCDEFS) \
                $(PCHFLAGS) $(OPTIMIZE)
-LINK_FLAGS     = $(LINK_DBG) -L"$(CCLIBDIR)"
+LINK_FLAGS     = $(LINK_DBG) -L"$(INST_COREDIR)" -L"$(CCLIBDIR)"
 OBJOUT_FLAG    = -o
 EXEOUT_FLAG    = -e
 LIBOUT_FLAG    = 
@@ -307,7 +321,7 @@ LINK_DBG    =
 .ENDIF
 
 CFLAGS         = $(INCLUDES) $(DEFINES) $(LOCDEFS) $(OPTIMIZE)
-LINK_FLAGS     = $(LINK_DBG) -L"$(CCLIBDIR)"
+LINK_FLAGS     = $(LINK_DBG) -L"$(INST_COREDIR)" -L"$(CCLIBDIR)"
 OBJOUT_FLAG    = -o
 EXEOUT_FLAG    = -o
 LIBOUT_FLAG    = 
@@ -379,7 +393,9 @@ LIBFILES    = $(LIBBASEFILES) $(LIBC)
 
 CFLAGS         = -nologo -Gf -W3 $(INCLUDES) $(DEFINES) $(LOCDEFS) \
                $(PCHFLAGS) $(OPTIMIZE)
-LINK_FLAGS     = -nologo -nodefaultlib $(LINK_DBG) -machine:$(PROCESSOR_ARCHITECTURE)
+LINK_FLAGS     = -nologo -nodefaultlib $(LINK_DBG) \
+               -libpath:"$(INST_COREDIR)" \
+               -machine:$(PROCESSOR_ARCHITECTURE)
 OBJOUT_FLAG    = -Fo
 EXEOUT_FLAG    = -Fe
 LIBOUT_FLAG    = /out:
@@ -427,17 +443,6 @@ $(o).dll:
 .ENDIF
 
 #
-INST_BIN       = $(INST_TOP)$(INST_VER)\bin$(INST_ARCH)
-INST_SCRIPT    = $(INST_TOP)$(INST_VER)\bin
-INST_LIB       = $(INST_TOP)$(INST_VER)\lib
-INST_POD       = $(INST_LIB)\pod
-INST_HTML      = $(INST_POD)\html
-LIBDIR         = ..\lib
-EXTDIR         = ..\ext
-PODDIR         = ..\pod
-EXTUTILSDIR    = $(LIBDIR)\extutils
-
-#
 # various targets
 MINIPERL       = ..\miniperl.exe
 MINIDIR                = .\mini