From 45c1d08e1561937dc7a4d66e53704a075d7ae6b8 Mon Sep 17 00:00:00 2001 From: Felix Ruess Date: Tue, 13 Jul 2010 21:54:18 +0000 Subject: [PATCH] Revert "fix elif without argument" wrong file commited This reverts commit cf9ffec2d6faa2030e36389462070ec668bd6b0b. --- conf/Makefile.arm7 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/Makefile.arm7 b/conf/Makefile.arm7 index 5dfc108692..9ecfbde12a 100644 --- a/conf/Makefile.arm7 +++ b/conf/Makefile.arm7 @@ -31,13 +31,13 @@ SRC_ARCH = arm7 # Define programs and commands. HAVE_ARM_NONE_EABI_GCC := $(wildcard /usr/bin/arm-none-eabi-gcc) ifeq ($(strip $(HAVE_ARM_NONE_EABI_GCC)),) -CC = /home/flixr/code/arm-2010q1/bin/arm-none-eabi-gcc +CC = arm-elf-gcc LD = $(CC) SHELL = sh -OBJCOPY = /home/flixr/code/arm-2010q1/bin/arm-none-eabi-objcopy -OBJDUMP = /home/flixr/code/arm-2010q1/bin/arm-none-eabi-objdump -SIZE = /home/flixr/code/arm-2010q1/bin/arm-none-eabi-size -NM = /home/flixr/code/arm-2010q1/bin/arm-none-eabi-nm +OBJCOPY = arm-elf-objcopy +OBJDUMP = arm-elf-objdump +SIZE = arm-elf-size +NM = arm-elf-nm else CC = arm-none-eabi-gcc LD = $(CC)