fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-17 12:23:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename RPi/Bebop toolchain locations to PX4_TOOLCHAIN_DIR

Browse Source
This commit is contained in:
Kabir Mohammed
2017-06-13 08:16:37 +02:00
committed by Lorenz Meier
parent f123ade6d3
commit 8b1ca2ea9b
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/toolchains/Toolchain-arm-linux-gnueabihf-clang.cmake
+6 -6
View File
@@ -1,9 +1,9 @@
include(CMakeForceCompiler)
if ($ENV{RPI_TOOLCHAIN_DIR} STREQUAL "")
message(FATAL_ERROR "RPI_TOOLCHAIN_DIR not set")
if ($ENV{PX4_TOOLCHAIN_DIR} STREQUAL "")
message(FATAL_ERROR "PX4_TOOLCHAIN_DIR not set")
else()
set(RPI_TOOLCHAIN_DIR $ENV{RPI_TOOLCHAIN_DIR})
set(PX4_TOOLCHAIN_DIR $ENV{PX4_TOOLCHAIN_DIR})
endif()
# this one is important
@@ -15,7 +15,7 @@ set(CMAKE_SYSTEM_VERSION 1)
# specify the cross compiler
# requires a symbolic link typically from /usr/bin/clang
find_program(C_COMPILER clang
PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin
PATHS ${PX4_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin
NO_DEFAULT_PATH
)
@@ -25,7 +25,7 @@ endif()
cmake_force_c_compiler(${C_COMPILER} Clang)
find_program(CXX_COMPILER clang++
PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin
PATHS ${PX4_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin
NO_DEFAULT_PATH
)
@@ -38,7 +38,7 @@ cmake_force_cxx_compiler(${CXX_COMPILER} Clang)
foreach(tool objcopy nm ld)
string(TOUPPER ${tool} TOOL)
find_program(${TOOL} arm-linux-gnueabihf-${tool}
PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin
PATHS ${PX4_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin
NO_DEFAULT_PATH
)
if(NOT ${TOOL})
cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake
+6 -6
View File
@@ -16,10 +16,10 @@
include(CMakeForceCompiler)
if ("$ENV{RPI_TOOLCHAIN_DIR}" STREQUAL "")
message(FATAL_ERROR "RPI_TOOLCHAIN_DIR not set")
if ("$ENV{PX4_TOOLCHAIN_DIR}" STREQUAL "")
message(FATAL_ERROR "PX4_TOOLCHAIN_DIR not set")
else()
set(RPI_TOOLCHAIN_DIR $ENV{RPI_TOOLCHAIN_DIR})
set(PX4_TOOLCHAIN_DIR $ENV{PX4_TOOLCHAIN_DIR})
endif()
# this one is important
@@ -30,7 +30,7 @@ set(CMAKE_SYSTEM_VERSION 1)
# specify the cross compiler
find_program(C_COMPILER arm-linux-gnueabihf-gcc
PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin
PATHS ${PX4_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin
NO_DEFAULT_PATH
)
@@ -40,7 +40,7 @@ endif()
cmake_force_c_compiler(${C_COMPILER} GNU)
find_program(CXX_COMPILER arm-linux-gnueabihf-g++
PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin
PATHS ${PX4_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin
NO_DEFAULT_PATH
)
@@ -53,7 +53,7 @@ cmake_force_cxx_compiler(${CXX_COMPILER} GNU)
foreach(tool objcopy nm ld)
string(TOUPPER ${tool} TOOL)
find_program(${TOOL} arm-linux-gnueabihf-${tool}
PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin
PATHS ${PX4_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin
NO_DEFAULT_PATH
)
if(NOT ${TOOL})