Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-31 20:38:27 +08:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

first look for compiler in /opt/paparazzi/arm-multilib then in ~/sat, try old arm-elf if arm-none-eabi not found

Browse Source
This commit is contained in:
Felix Ruess
2011-10-18 12:01:49 +02:00
parent c7bb02e3c0
commit 0369c96409
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -1
View File
@@ -65,7 +65,7 @@ OCAML=$(shell which ocaml)
OCAMLRUN=$(shell which ocamlrun) OCAMLRUN=$(shell which ocamlrun)
# try to find the paparazzi multilib toolchain # 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),) ifneq ($(TOOLCHAIN_DIR),)
#found the compiler from the paparazzi multilib package #found the compiler from the paparazzi multilib package
ARMGCC=$(TOOLCHAIN_DIR)/bin/arm-none-eabi-gcc ARMGCC=$(TOOLCHAIN_DIR)/bin/arm-none-eabi-gcc
conf/Makefile.lpc21
+2 -2
View File
@@ -34,7 +34,7 @@ SRC_ARCH = arch/lpc21
# Programs location # Programs location
# try to find the paparazzi multilib toolchain # 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 # found the new paparazzi toolchain, use it
@@ -52,7 +52,7 @@ SIZE = $(GCC_BIN_PREFIX)-size
OOCD = $(TOOLCHAIN_DIR)/bin/openocd 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 else
conf/Makefile.stm32
+1 -1
View File
@@ -38,7 +38,7 @@ OPT = s
#OPT = 0 #OPT = 0
# Programs location # 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_BIN_DIR=$(TOOLCHAIN_DIR)/bin
GCC_LIB_DIR=$(TOOLCHAIN_DIR)/arm-none-eabi/lib GCC_LIB_DIR=$(TOOLCHAIN_DIR)/arm-none-eabi/lib
sw/airborne/arch/lpc21/lpcusb/Makefile
+2 -2
View File
@@ -6,7 +6,7 @@ DATE = $$(date +%Y%m%d)
# Tool definitions # Tool definitions
# try to find the paparazzi multilib toolchain # 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 # found the new paparazzi toolchain, use it
@@ -23,7 +23,7 @@ CP = $(GCC_BIN_PREFIX)-objcopy
OD = $(GCC_BIN_PREFIX)-objdump 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 else