Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-01 11:06:04 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

Rename RPi/Bebop toolchain locations to PX4_TOOLCHAIN_DIR

Browse Source
This commit is contained in:
Kabir Mohammed
2017-02-04 13:37:25 +05:30
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
Tools/adb_upload_to_bebop.sh
+1 -1
View File
@@ -34,7 +34,7 @@ adb shell mount -o remount,rw /
adb shell touch /home/root/parameters adb shell touch /home/root/parameters
adb shell mkdir -p /data/ftp/internal_000/fs/microsd adb shell mkdir -p /data/ftp/internal_000/fs/microsd
${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin/arm-linux-gnueabihf-strip \ ${PX4_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin/arm-linux-gnueabihf-strip \
-R .comment -R .gnu.version \ -R .comment -R .gnu.version \
../build_posix_bebop_default/src/firmware/posix/px4 ../build_posix_bebop_default/src/firmware/posix/px4
cmake/configs/posix_bebop_default.cmake
+1 -1
View File
@@ -9,7 +9,7 @@ add_definitions(
) )
set(CMAKE_PROGRAM_PATH set(CMAKE_PROGRAM_PATH
"${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin" "${PX4_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin"
${CMAKE_PROGRAM_PATH} ${CMAKE_PROGRAM_PATH}
) )
cmake/configs/posix_rpi_cross.cmake
+1 -1
View File
@@ -8,6 +8,6 @@ endif()
set(CMAKE_PROGRAM_PATH set(CMAKE_PROGRAM_PATH
"${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin" "${PX4_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin"
${CMAKE_PROGRAM_PATH} ${CMAKE_PROGRAM_PATH}
) )
cmake/posix/px4_impl_posix.cmake
+1 -1
View File
@@ -274,7 +274,7 @@ elseif ("${BOARD}" STREQUAL "rpi" AND "$ENV{RPI_USE_CLANG}" STREQUAL "1")
-m32 -m32
--target=arm-linux-gnueabihf --target=arm-linux-gnueabihf
-ccc-gcc-name arm-linux-gnueabihf -ccc-gcc-name arm-linux-gnueabihf
--sysroot=${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/arm-linux-gnueabihf/libc/) --sysroot=${PX4_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/arm-linux-gnueabihf/libc/)
set(added_c_flags ${POSIX_CMAKE_C_FLAGS} ${clang_added_flags}) set(added_c_flags ${POSIX_CMAKE_C_FLAGS} ${clang_added_flags})
list(APPEND added_cxx_flags ${POSIX_CMAKE_CXX_FLAGS} ${clang_added_flags}) list(APPEND added_cxx_flags ${POSIX_CMAKE_CXX_FLAGS} ${clang_added_flags})
cmake/toolchains/Toolchain-arm-linux-gnueabihf-clang.cmake
+6 -6
View File
@@ -1,9 +1,9 @@
include(CMakeForceCompiler) include(CMakeForceCompiler)
if ($ENV{RPI_TOOLCHAIN_DIR} STREQUAL "") if ($ENV{PX4_TOOLCHAIN_DIR} STREQUAL "")
message(FATAL_ERROR "RPI_TOOLCHAIN_DIR not set") message(FATAL_ERROR "PX4_TOOLCHAIN_DIR not set")
else() else()
set(RPI_TOOLCHAIN_DIR $ENV{RPI_TOOLCHAIN_DIR}) set(PX4_TOOLCHAIN_DIR $ENV{PX4_TOOLCHAIN_DIR})
endif() endif()
# this one is important # this one is important
@@ -15,7 +15,7 @@ set(CMAKE_SYSTEM_VERSION 1)
# specify the cross compiler # specify the cross compiler
# requires a symbolic link typically from /usr/bin/clang # requires a symbolic link typically from /usr/bin/clang
find_program(C_COMPILER 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 NO_DEFAULT_PATH
) )
@@ -25,7 +25,7 @@ endif()
cmake_force_c_compiler(${C_COMPILER} Clang) cmake_force_c_compiler(${C_COMPILER} Clang)
find_program(CXX_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 NO_DEFAULT_PATH
) )
@@ -38,7 +38,7 @@ cmake_force_cxx_compiler(${CXX_COMPILER} Clang)
foreach(tool objcopy nm ld) foreach(tool objcopy nm ld)
string(TOUPPER ${tool} TOOL) string(TOUPPER ${tool} TOOL)
find_program(${TOOL} arm-linux-gnueabihf-${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 NO_DEFAULT_PATH
) )
if(NOT ${TOOL}) if(NOT ${TOOL})
cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake
+6 -6
View File
@@ -16,10 +16,10 @@
include(CMakeForceCompiler) include(CMakeForceCompiler)
if ("$ENV{RPI_TOOLCHAIN_DIR}" STREQUAL "") if ("$ENV{PX4_TOOLCHAIN_DIR}" STREQUAL "")
message(FATAL_ERROR "RPI_TOOLCHAIN_DIR not set") message(FATAL_ERROR "PX4_TOOLCHAIN_DIR not set")
else() else()
set(RPI_TOOLCHAIN_DIR $ENV{RPI_TOOLCHAIN_DIR}) set(PX4_TOOLCHAIN_DIR $ENV{PX4_TOOLCHAIN_DIR})
endif() endif()
# this one is important # this one is important
@@ -30,7 +30,7 @@ set(CMAKE_SYSTEM_VERSION 1)
# specify the cross compiler # specify the cross compiler
find_program(C_COMPILER arm-linux-gnueabihf-gcc 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 NO_DEFAULT_PATH
) )
@@ -40,7 +40,7 @@ endif()
cmake_force_c_compiler(${C_COMPILER} GNU) cmake_force_c_compiler(${C_COMPILER} GNU)
find_program(CXX_COMPILER arm-linux-gnueabihf-g++ 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 NO_DEFAULT_PATH
) )
@@ -53,7 +53,7 @@ cmake_force_cxx_compiler(${CXX_COMPILER} GNU)
foreach(tool objcopy nm ld) foreach(tool objcopy nm ld)
string(TOUPPER ${tool} TOOL) string(TOUPPER ${tool} TOOL)
find_program(${TOOL} arm-linux-gnueabihf-${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 NO_DEFAULT_PATH
) )
if(NOT ${TOOL}) if(NOT ${TOOL})