From 0369c96409eb9fbb2be1285b8f5cfdc6777293ce Mon Sep 17 00:00:00 2001 From: Felix Ruess Date: Tue, 18 Oct 2011 12:01:49 +0200 Subject: [PATCH] first look for compiler in /opt/paparazzi/arm-multilib then in ~/sat, try old arm-elf if arm-none-eabi not found --- Makefile | 2 +- conf/Makefile.lpc21 | 4 ++-- conf/Makefile.stm32 | 2 +- sw/airborne/arch/lpc21/lpcusb/Makefile | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index e69105403d..1ad6f073ee 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ OCAML=$(shell which ocaml) OCAMLRUN=$(shell which ocamlrun) # try to find the paparazzi multilib toolchain -TOOLCHAIN_DIR=$(shell find -L ~/sat /opt/paparazzi/arm-multilib -maxdepth 1 -type d -name arm-none-eabi 2>/dev/null | head -n 1 | xargs dirname ) +TOOLCHAIN_DIR=$(shell find -L /opt/paparazzi/arm-multilib ~/sat -maxdepth 1 -type d -name arm-none-eabi 2>/dev/null | head -n 1 | xargs dirname ) ifneq ($(TOOLCHAIN_DIR),) #found the compiler from the paparazzi multilib package ARMGCC=$(TOOLCHAIN_DIR)/bin/arm-none-eabi-gcc diff --git a/conf/Makefile.lpc21 b/conf/Makefile.lpc21 index 2dbf9a0fdf..1a8ae8eaef 100644 --- a/conf/Makefile.lpc21 +++ b/conf/Makefile.lpc21 @@ -34,7 +34,7 @@ SRC_ARCH = arch/lpc21 # Programs location # try to find the paparazzi multilib toolchain -TOOLCHAIN_DIR=$(shell find -L ~/sat /opt/paparazzi/arm-multilib /opt/paparazzi/stm32 -maxdepth 1 -type d -name arm-none-eabi 2>/dev/null | head -n 1 | xargs dirname ) +TOOLCHAIN_DIR=$(shell find -L /opt/paparazzi/arm-multilib ~/sat -maxdepth 1 -type d -name arm-none-eabi 2>/dev/null | head -n 1 | xargs dirname ) # # found the new paparazzi toolchain, use it @@ -52,7 +52,7 @@ SIZE = $(GCC_BIN_PREFIX)-size OOCD = $(TOOLCHAIN_DIR)/bin/openocd # -# If we can't find the toolchain (in ~/sat or /opt/paparazzi/stm32) then try picking up the compilers from the path +# If we can't find the toolchain (in /opt/paparazzi/arm-multilib or ~/sat) then try picking up the compilers from the path # else diff --git a/conf/Makefile.stm32 b/conf/Makefile.stm32 index d84badb1d0..817d936867 100644 --- a/conf/Makefile.stm32 +++ b/conf/Makefile.stm32 @@ -38,7 +38,7 @@ OPT = s #OPT = 0 # Programs location -TOOLCHAIN_DIR=$(shell find -L ~/sat /opt/paparazzi/arm-multilib /opt/paparazzi/stm32 -maxdepth 1 -type d -name arm-none-eabi 2>/dev/null | head -n 1 | xargs dirname ) +TOOLCHAIN_DIR=$(shell find -L /opt/paparazzi/arm-multilib ~/sat /opt/paparazzi/stm32 -maxdepth 1 -type d -name arm-none-eabi 2>/dev/null | head -n 1 | xargs dirname ) GCC_BIN_DIR=$(TOOLCHAIN_DIR)/bin GCC_LIB_DIR=$(TOOLCHAIN_DIR)/arm-none-eabi/lib diff --git a/sw/airborne/arch/lpc21/lpcusb/Makefile b/sw/airborne/arch/lpc21/lpcusb/Makefile index 584e9bfffe..62c70f9397 100644 --- a/sw/airborne/arch/lpc21/lpcusb/Makefile +++ b/sw/airborne/arch/lpc21/lpcusb/Makefile @@ -6,7 +6,7 @@ DATE = $$(date +%Y%m%d) # Tool definitions # try to find the paparazzi multilib toolchain -TOOLCHAIN_DIR=$(shell find -L ~/sat /opt/paparazzi/arm-multilib -maxdepth 1 -type d -name arm-none-eabi 2>/dev/null | head -n 1 | xargs dirname ) +TOOLCHAIN_DIR=$(shell find -L /opt/paparazzi/arm-multilib ~/sat -maxdepth 1 -type d -name arm-none-eabi 2>/dev/null | head -n 1 | xargs dirname ) # # found the new paparazzi toolchain, use it @@ -23,7 +23,7 @@ CP = $(GCC_BIN_PREFIX)-objcopy OD = $(GCC_BIN_PREFIX)-objdump # -# If we can't find the toolchain (in ~/sat or /opt/paparazzi/arm-multilib) then try picking up the compilers from the path +# If we can't find the toolchain (in /opt/paparazzi/arm-multilib or ~/sat) then try picking up the compilers from the path # else