In perl.git, the branch blead has been updated <https://perl5.git.perl.org/perl.git/commitdiff/6f669bf58bbfaf8d7ef367574be9252df84c08d1?hp=3676f9e77d46b61f4785aad171f02bed29df0c07>
- Log ----------------------------------------------------------------- commit 6f669bf58bbfaf8d7ef367574be9252df84c08d1 Author: Steve Hay <[email protected]> Date: Tue Nov 28 08:40:56 2017 +0000 Fix $Config{libpth} for x64 builds with VC++ earlier than 14.1 (VS2017) This commit adapts and extends a patch from Marc-Philip <[email protected]> on perl #132484. ----------------------------------------------------------------------- Summary of changes: win32/GNUmakefile | 8 ++++++++ win32/Makefile | 4 ++++ win32/makefile.mk | 7 +++++++ 3 files changed, 19 insertions(+) diff --git a/win32/GNUmakefile b/win32/GNUmakefile index 742303043c..7d5a9911c9 100644 --- a/win32/GNUmakefile +++ b/win32/GNUmakefile @@ -474,6 +474,10 @@ ifneq ($(GCCCROSS),) CCINCDIR := $(CCHOME)\$(GCCCROSS)\include CCLIBDIR := $(CCHOME)\$(GCCCROSS)\lib ARCHPREFIX := $(GCCCROSS)- +else ifeq ($(CCTYPE),GCC) +CCINCDIR := $(CCHOME)\include +CCLIBDIR := $(CCHOME)\lib +ARCHPREFIX := else CCINCDIR := $(CCHOME)\include ifeq ($(CCTYPE),MSVC141) @@ -483,8 +487,12 @@ else CCLIBDIR := $(CCHOME)\lib\x86 endif else +ifeq ($(WIN64),define) +CCLIBDIR := $(CCHOME)\lib\amd64 +else CCLIBDIR := $(CCHOME)\lib endif +endif ARCHPREFIX := endif diff --git a/win32/Makefile b/win32/Makefile index 6983689a57..298efb209e 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -446,7 +446,11 @@ CCLIBDIR = $(CCHOME)\lib\x64 CCLIBDIR = $(CCHOME)\lib\x86 ! ENDIF !ELSE +! IF "$(WIN64)" == "define" +CCLIBDIR = $(CCHOME)\lib\amd64 +! ELSE CCLIBDIR = $(CCHOME)\lib +! ENDIF !ENDIF ARCHDIR = ..\lib\$(ARCHNAME) diff --git a/win32/makefile.mk b/win32/makefile.mk index 297cb363b3..76bc194673 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -452,6 +452,9 @@ ARCHNAME !:= $(ARCHNAME)-ld .IF "$(GCCCROSS)" == "define" CCINCDIR *= $(CCHOME)\x86_64-w64-mingw32\include CCLIBDIR *= $(CCHOME)\x86_64-w64-mingw32\lib +.ELIF "$(CCTYPE)" == "GCC" +CCINCDIR *= $(CCHOME)\include +CCLIBDIR *= $(CCHOME)\lib .ELSE CCINCDIR *= $(CCHOME)\include .IF "$(CCTYPE)" == "MSVC141" @@ -461,9 +464,13 @@ CCLIBDIR *= $(CCHOME)\lib\x64 CCLIBDIR *= $(CCHOME)\lib\x86 .ENDIF .ELSE +.IF "$(WIN64)" == "define" +CCLIBDIR *= $(CCHOME)\lib\amd64 +.ELSE CCLIBDIR *= $(CCHOME)\lib .ENDIF .ENDIF +.ENDIF # Set DLL location for GCC compilers. .IF "$(CCTYPE)" == "GCC" -- Perl5 Master Repository
