diff --git a/build/linux/aarch64/arm.linux.cross.cmake b/build/linux/aarch64/arm.linux.cross.cmake index a6bd5327..b7fabf60 100644 --- a/build/linux/aarch64/arm.linux.cross.cmake +++ b/build/linux/aarch64/arm.linux.cross.cmake @@ -1,9 +1,13 @@ cmake_minimum_required( VERSION 2.6.3 ) +if(NOT TOOLCHAIN) + set(TOOLCHAIN "aarch64-linux-gnu-") +endif() + SET(CMAKE_SYSTEM_NAME Linux) -SET(CMAKE_C_COMPILER "aarch64-linux-gnu-gcc") -SET(CMAKE_CXX_COMPILER "aarch64-linux-gnu-g++") +SET(CMAKE_C_COMPILER "${TOOLCHAIN}gcc") +SET(CMAKE_CXX_COMPILER "${TOOLCHAIN}g++") #SET(CMAKE_SYSTEM_PROCESSOR "armv7-a") SET(CMAKE_SYSTEM_PROCESSOR "armv8-a") diff --git a/build/linux/aarch64/make-Makefiles.bash b/build/linux/aarch64/make-Makefiles.bash index a648bc4a..c9401ef6 100755 --- a/build/linux/aarch64/make-Makefiles.bash +++ b/build/linux/aarch64/make-Makefiles.bash @@ -24,6 +24,13 @@ fi # generate Makefile cmake -DCMAKE_BUILD_TYPE=Release \ + -DTOOLCHAIN=${TOOLCHAIN} \ -DCMAKE_TOOLCHAIN_FILE=./arm.linux.cross.cmake \ -G "Unix Makefiles" \ ${MPP_TOP} + +if [ "${CMAKE_PARALLEL_ENABLE}" = "0" ]; then + cmake --build . +else + cmake --build . -j +fi diff --git a/build/linux/arm/arm.linux.cross.cmake b/build/linux/arm/arm.linux.cross.cmake index cc70f621..0884596f 100644 --- a/build/linux/arm/arm.linux.cross.cmake +++ b/build/linux/arm/arm.linux.cross.cmake @@ -1,9 +1,13 @@ cmake_minimum_required( VERSION 2.6.3 ) +if(NOT TOOLCHAIN) + set(TOOLCHAIN "arm-linux-gnueabi-") +endif() + SET(CMAKE_SYSTEM_NAME Linux) -SET(CMAKE_C_COMPILER "arm-linux-gnueabi-gcc") -SET(CMAKE_CXX_COMPILER "arm-linux-gnueabi-g++") +SET(CMAKE_C_COMPILER "${TOOLCHAIN}gcc") +SET(CMAKE_CXX_COMPILER "${TOOLCHAIN}g++") SET(CMAKE_SYSTEM_PROCESSOR "armv7-a") #SET(CMAKE_SYSTEM_PROCESSOR "armv7-a_hardfp") diff --git a/build/linux/arm/make-Makefiles.bash b/build/linux/arm/make-Makefiles.bash index b5777033..26100862 100755 --- a/build/linux/arm/make-Makefiles.bash +++ b/build/linux/arm/make-Makefiles.bash @@ -24,7 +24,14 @@ fi # generate Makefile cmake -DCMAKE_BUILD_TYPE=Release \ + -DTOOLCHAIN=${TOOLCHAIN} \ -DCMAKE_TOOLCHAIN_FILE=./arm.linux.cross.cmake \ -DHAVE_DRM=ON \ -G "Unix Makefiles" \ ${MPP_TOP} + +if [ "${CMAKE_PARALLEL_ENABLE}" = "0" ]; then + cmake --build . +else + cmake --build . -j +fi diff --git a/build/linux/opt_proc.sh b/build/linux/opt_proc.sh index 29d7bd4c..4e22bf35 100755 --- a/build/linux/opt_proc.sh +++ b/build/linux/opt_proc.sh @@ -23,10 +23,16 @@ while [ $# -gt 0 ]; do case $1 in --help | -h) echo "Execute make-Makefiles.sh in *arm/* or *aarch64/* with some args." + echo " use --toolchain to set toolchain e.g. --toolchain path/aarch64-none-linux-gnu-" echo " use --rebuild to rebuild after clean" echo " use --clean to clean all build file" exit 1 ;; + --toolchain) + TOOLCHAIN=$2 + echo "toolchain: ${TOOLCHAIN}" + shift + ;; --rebuild) ${MAKE_PROGRAM} clean if [ -f "CMakeCache.txt" ]; then