From 110f41b7a07e71d66858e812bdfe99719da2ff02 Mon Sep 17 00:00:00 2001 From: Joel Dice Date: Tue, 9 Nov 2010 11:28:58 -0700 Subject: [PATCH] ARM makefile tweaks --- makefile | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/makefile b/makefile index 9031e7a628..8c2f666220 100644 --- a/makefile +++ b/makefile @@ -147,7 +147,15 @@ endif ifeq ($(arch),arm) asm = arm pointer-size = 4 - cflags += -Wno-psabi -march=armv5t + cflags += -Wno-psabi + + ifneq ($(arch),$(build-arch)) + cxx = arm-linux-gnueabi-g++ + cc = arm-linux-gnueabi-gcc + ar = arm-linux-gnueabi-ar + ranlib = arm-linux-gnueabi-ranlib + strip = arm-linux-gnueabi-strip + endif endif ifeq ($(platform),darwin) @@ -180,16 +188,6 @@ ifeq ($(platform),darwin) endif endif -ifeq ($(arch),arm) - ifneq ($(arch),$(build-arch)) - cxx = arm-linux-gnueabi-g++ - cc = arm-linux-gnueabi-gcc - ar = arm-linux-gnueabi-ar - ranlib = arm-linux-gnueabi-ranlib - strip = arm-linux-gnueabi-strip - endif -endif - ifeq ($(platform),windows) inc = "$(root)/win32/include" lib = "$(root)/win32/lib"