build: in Makefile.m32 moved target autodetection.

Moved target autodetection block after defining CC macro.
curl · Nov 19, 2014 · cf510ad · cf510ad
1 parent 140ca2d
commit cf510ad
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
@@ -54,16 +54,6 @@ ifndef LIBCARES_PATH
 LIBCARES_PATH = $(PROOT)/ares
 endif
 
-# Set environment var ARCH to your architecture to override autodetection.
-ifndef ARCH
-TARGET	:= $(shell $(CC) -dumpmachine)
-ifeq ($(findstring x86_64,$(TARGET)),x86_64)
-ARCH	= w64
-else
-ARCH	= w32
-endif
-endif
-
 CC	= $(CROSSPREFIX)gcc
 CFLAGS	= -g -O2 -Wall
 CFLAGS	+= -fno-strict-aliasing
@@ -75,6 +65,16 @@ RC	= $(CROSSPREFIX)windres
 RCFLAGS	= --include-dir=$(PROOT)/include -DDEBUGBUILD=0 -O COFF
 STRIP	= $(CROSSPREFIX)strip -g
 
+# Set environment var ARCH to your architecture to override autodetection.
+ifndef ARCH
+TARGET	:= $(shell $(CC) -dumpmachine)
+ifeq ($(findstring x86_64,$(TARGET)),x86_64)
+ARCH	= w64
+else
+ARCH	= w32
+endif
+endif
+
 ifeq ($(ARCH),w64)
 CFLAGS  += -D_AMD64_
 RCFLAGS += -F pe-x86-64

diff --git a/src/Makefile.m32 b/src/Makefile.m32
@@ -66,16 +66,6 @@ ifndef LIBCARES_PATH
 LIBCARES_PATH = $(PROOT)/ares
 endif
 
-# Set environment var ARCH to your architecture to override autodetection.
-ifndef ARCH
-TARGET  := $(shell $(CC) -dumpmachine)
-ifeq ($(findstring x86_64,$(TARGET)),x86_64)
-ARCH    = w64
-else
-ARCH    = w32
-endif
-endif
-
 CC	= $(CROSSPREFIX)gcc
 CFLAGS	= -g -O2 -Wall
 CFLAGS	+= -fno-strict-aliasing
@@ -90,6 +80,16 @@ STRIP   = $(CROSSPREFIX)strip -g
 # PERL = perl
 # NROFF = nroff
 
+# Set environment var ARCH to your architecture to override autodetection.
+ifndef ARCH
+TARGET  := $(shell $(CC) -dumpmachine)
+ifeq ($(findstring x86_64,$(TARGET)),x86_64)
+ARCH    = w64
+else
+ARCH    = w32
+endif
+endif
+
 ifeq ($(ARCH),w64)
 CFLAGS	+= -D_AMD64_
 RCFLAGS += -F pe-x86-64