summaryrefslogtreecommitdiff
path: root/win32/GNUmakefile
diff options
context:
space:
mode:
authorDaniel Dragan <bulk88@hotmail.com>2016-02-29 09:52:56 +1100
committerTony Cook <tony@develop-help.com>2016-02-29 09:54:49 +1100
commitae146f5496edb6eba943c279242f4754042dd24d (patch)
tree369ee54101fe4ca239db68630ecd9e5a74a8e98c /win32/GNUmakefile
parent40616ee38f6f95439179a1eef5522da572c98886 (diff)
downloadperl-ae146f5496edb6eba943c279242f4754042dd24d.tar.gz
[perl #127584] using Win32 32b gmake with 64b gcc caused wrong archname
Using a 32 bit Win32 gmake, with a GCC that produces 64 bit binaries, made a perl with PTRSIZE 64 bits, and 64 bit machine code, but archname IDed that build as "x86" not "x64", which is very wrong. Perl's win32/GNUMakefile autodetects the bitness of the GCC and sets things up accordingly. Fixes [perl #127584]. This bug might be a regression introduced in commit 745dedb9b5 or the GNUMakefile parallel build branch.
Diffstat (limited to 'win32/GNUmakefile')
-rw-r--r--win32/GNUmakefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/win32/GNUmakefile b/win32/GNUmakefile
index 9511325bbc..51f9584d0a 100644
--- a/win32/GNUmakefile
+++ b/win32/GNUmakefile
@@ -357,11 +357,11 @@ endif
ifeq ($(CCTYPE),GCC)
ifeq ($(GCCTARGET),x86_64-w64-mingw32)
WIN64 := define
-ARCHITECTURE := x64
+PROCESSOR_ARCHITECTURE := x64
endif
ifeq ($(GCCTARGET),i686-w64-mingw32)
WIN64 := undef
-ARCHITECTURE := x86
+PROCESSOR_ARCHITECTURE := x86
endif
endif