diff options
| author | wsnipex <wsnipex@a1.net> | 2017-11-04 17:25:35 +0100 |
|---|---|---|
| committer | wsnipex <wsnipex@a1.net> | 2017-11-08 22:19:56 +0100 |
| commit | 79b0f1dff67d661addd74e85edafdb8c207a3a00 (patch) | |
| tree | b906e3011979b6e8dfe79c3e6b829ac896cd3b1b /tools | |
| parent | 8caf6801668153777e341aebebc665146c7806e3 (diff) | |
[depends] fix rbpi toolchain usage
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/buildsteps/rbpi/configure-depends | 4 | ||||
| -rw-r--r-- | tools/depends/README | 2 | ||||
| -rw-r--r-- | tools/depends/target/Toolchain.cmake.in | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tools/buildsteps/rbpi/configure-depends b/tools/buildsteps/rbpi/configure-depends index b1fb8a6b27..ac7a691af4 100755 --- a/tools/buildsteps/rbpi/configure-depends +++ b/tools/buildsteps/rbpi/configure-depends @@ -6,7 +6,7 @@ if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] then cd $WORKSPACE/tools/depends; - PATH="$PATH:$JENKINS_RBPI_DEVENV/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian-x64/bin" \ ./configure --with-platform=raspberry-pi --host=arm-linux-gnueabihf --prefix=$XBMC_DEPENDS_ROOT --with-tarballs=$TARBALLS \ - --with-firmware=$JENKINS_RBPI_DEVENV/firmware --build=i686-linux $DEBUG_SWITCH + --with-firmware=$JENKINS_RBPI_DEVENV/firmware --build=i686-linux $DEBUG_SWITCH \ + --with-toolchain=$JENKINS_RBPI_DEVENV/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf fi diff --git a/tools/depends/README b/tools/depends/README index 5a273d38f5..d61cf59cb5 100644 --- a/tools/depends/README +++ b/tools/depends/README @@ -37,7 +37,7 @@ TVOS: ./configure --with-toolchain=/opt/toolchains/my-example-toolchain/ --prefix=/opt/xbmc-deps --host=arm-linux-gnueabi RASPBERRY-PI: - PATH="/opt/rbp-dev/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin:$PATH" ./configure --with-platform=raspberry-pi --host=arm-linux-gnueabihf --prefix=/opt/xbmc-deps --with-tarballs=/opt/xbmc-tarballs --with-toolchain=/opt/rbp-dev/tools/arm-bcm2708/arm-bcm2708hardfp-linux-gnueabi/arm-bcm2708hardfp-linux-gnueabi/sysroot --with-firmware=/opt/rbp-dev/firmware --build=i686-linux + ./configure --with-platform=raspberry-pi --host=arm-linux-gnueabihf --prefix=/opt/xbmc-deps --with-tarballs=/opt/xbmc-tarballs --with-toolchain=/opt/rbp-dev/tools/arm-bcm2708/arm-rpi-4.9.3-linux-gnueabihf --with-firmware=/opt/rbp-dev/firmware --build=i686-linux Native toolchain ./configure --with-toolchain=/usr --prefix=/opt/xbmc-deps --host=x86_64-linux-gnu diff --git a/tools/depends/target/Toolchain.cmake.in b/tools/depends/target/Toolchain.cmake.in index 40c3e356aa..59db66b4e9 100644 --- a/tools/depends/target/Toolchain.cmake.in +++ b/tools/depends/target/Toolchain.cmake.in @@ -63,7 +63,7 @@ endif() set(CMAKE_FIND_ROOT_PATH @prefix@/@deps_dir@) set(CMAKE_LIBRARY_PATH @prefix@/@deps_dir@/lib) if(NOT "@use_toolchain@" STREQUAL "") - list(APPEND CMAKE_FIND_ROOT_PATH @use_toolchain@ @use_toolchain@/usr @use_toolchain@/sysroot/usr) + list(APPEND CMAKE_FIND_ROOT_PATH @use_toolchain@ @use_toolchain@/@use_host@ @use_toolchain@/@use_host@/sysroot @use_toolchain@/@use_host@/sysroot/usr @use_toolchain@/@use_host@/libc @use_toolchain@/lib/@use_host@/sysroot @use_toolchain@/usr @use_toolchain@/sysroot/usr) set(CMAKE_LIBRARY_PATH "${CMAKE_LIBRARY_PATH}:@use_toolchain@/usr/lib/@use_host@:@use_toolchain@/lib/@use_host@") endif() if(NOT "@use_sdk_path@" STREQUAL "") |