generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build: in Makefile.m32 moved target autodetection.

Browse Source 
Moved target autodetection block after defining CC macro.
This commit is contained in:
Guenter Knauf
2014-11-19 12:39:20 +01:00
parent 140ca2dcc2
commit cf510ad781
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Makefile.m32
View File

@@ -54,16 +54,6 @@ ifndef LIBCARES_PATH
LIBCARES_PATH = $(PROOT)/ares LIBCARES_PATH = $(PROOT)/ares
endif 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 CC = $(CROSSPREFIX)gcc
CFLAGS = -g -O2 -Wall CFLAGS = -g -O2 -Wall
CFLAGS += -fno-strict-aliasing CFLAGS += -fno-strict-aliasing
@@ -75,6 +65,16 @@ RC = $(CROSSPREFIX)windres
RCFLAGS = --include-dir=$(PROOT)/include -DDEBUGBUILD=0 -O COFF RCFLAGS = --include-dir=$(PROOT)/include -DDEBUGBUILD=0 -O COFF
STRIP = $(CROSSPREFIX)strip -g 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) ifeq ($(ARCH),w64)
CFLAGS += -D_AMD64_ CFLAGS += -D_AMD64_
RCFLAGS += -F pe-x86-64 RCFLAGS += -F pe-x86-64

20
src/Makefile.m32
View File

@@ -66,16 +66,6 @@ ifndef LIBCARES_PATH
LIBCARES_PATH = $(PROOT)/ares LIBCARES_PATH = $(PROOT)/ares
endif 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 CC = $(CROSSPREFIX)gcc
CFLAGS = -g -O2 -Wall CFLAGS = -g -O2 -Wall
CFLAGS += -fno-strict-aliasing CFLAGS += -fno-strict-aliasing
@@ -90,6 +80,16 @@ STRIP = $(CROSSPREFIX)strip -g
# PERL = perl # PERL = perl
# NROFF = nroff # 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) ifeq ($(ARCH),w64)
CFLAGS += -D_AMD64_ CFLAGS += -D_AMD64_
RCFLAGS += -F pe-x86-64 RCFLAGS += -F pe-x86-64