doohoyi/comport
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use variables 'build.arch' and 'target.arch' consistently

Browse source
This commit is contained in:
katjav 2018-01-21 12:34:45 +01:00
parent 867ad5e8e8
commit 231e344b44
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Makefile.pdlibbuilder
View file

@ -467,15 +467,23 @@ $(eval $(for$(system)))
#=== architecture ============================================================== #=== architecture ==============================================================
# native architecture # native architecture of the build machine
machine := $(shell uname --machine) build.arch := $(shell uname --machine)
# Target architecture as reported by compiler. Give precedence to eventual # Target architecture as reported by compiler. Give precedence to eventual
# user-defined compiler. The first field of <cpu>-<vendor>-<os> is extracted. # user-defined compiler. The first field of <cpu>-<vendor>-<os> is extracted.
ifneq ($(origin CXX), default) ifneq ($(origin CXX), default)
target.arch = $(firstword $(subst -, ,$(shell $(CXX) -dumpmachine))) dumpmachine.cpu = $(firstword $(subst -, ,$(shell $(CXX) -dumpmachine)))
else else
target.arch = $(firstword $(subst -, ,$(shell $(CC) -dumpmachine))) dumpmachine.cpu = $(firstword $(subst -, ,$(shell $(CC) -dumpmachine)))
endif
# Target architecture as reported by compiler is only used for Windows at the
# moment. For other systems this still has to be tested.
ifeq ($(system), Windows)
target.arch = $(dumpmachine.cpu)
else
target.arch = $(build.arch)
endif endif
@ -491,19 +499,19 @@ endif
# arch.c.flags are overriden below. # arch.c.flags are overriden below.
# Raspberry Pi 1st generation # Raspberry Pi 1st generation
ifeq ($(machine), armv6l) ifeq ($(target.arch), armv6l)
arch.c.flags = -march=armv6 -mfpu=vfp -mfloat-abi=hard arch.c.flags = -march=armv6 -mfpu=vfp -mfloat-abi=hard
# Beagle, Udoo, RPi2 etc. # Beagle, Udoo, RPi2 etc.
else ifeq ($(machine), armv7l) else ifeq ($(target.arch), armv7l)
arch.c.flags = -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard arch.c.flags = -march=armv7-a -mfpu=vfpv3 -mfloat-abi=hard
# Intel 32 bit, build with SSE and SSE2 instructions # Intel 32 bit, build with SSE and SSE2 instructions
else ifeq ($(findstring $(machine), i386 i686), $(machine)) else ifeq ($(findstring $(target.arch), i386 i686), $(target.arch))
arch.c.flags = -march=pentium4 -mfpmath=sse -msse -msse2 arch.c.flags = -march=pentium4 -mfpmath=sse -msse -msse2
# Intel/AMD 64 bit, build with SSE, SSE2 and SSE3 instructions # Intel/AMD 64 bit, build with SSE, SSE2 and SSE3 instructions
else ifeq ($(findstring $(machine), x86_64), $(machine)) else ifeq ($(findstring $(target.arch), x86_64), $(target.arch))
arch.c.flags = -march=core2 -mfpmath=sse -msse -msse2 -msse3 arch.c.flags = -march=core2 -mfpmath=sse -msse -msse2 -msse3
# if none of the above architectures detected # if none of the above architectures detected
@ -560,12 +568,12 @@ ifeq ($(system), Darwin)
-compatibility_version 1 -current_version 1.0 -compatibility_version 1 -current_version 1.0
stripflags = -x stripflags = -x
version.flag := $(filter $(cflags), -mmacosx-version-min=%) version.flag := $(filter $(cflags), -mmacosx-version-min=%)
ifeq ($(machine), i386) ifeq ($(target.arch), i386)
cxx.flags := -fcheck-new cxx.flags := -fcheck-new
arch := ppc i386 x86_64 arch := ppc i386 x86_64
version.flag ?= -mmacosx-version-min=10.4 version.flag ?= -mmacosx-version-min=10.4
endif endif
ifeq ($(machine), x86_64) ifeq ($(target.arch), x86_64)
arch := i386 x86_64 arch := i386 x86_64
version.flag ?= -mmacosx-version-min=10.5 version.flag ?= -mmacosx-version-min=10.5
endif endif