From c8389f89ea0e21168075452222e850d8b187f278 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Tue, 16 Jan 2018 18:40:15 -0500 Subject: [PATCH] Fix some variables for Ubuntu 16 (GH #565) --- setenv-embedded.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/setenv-embedded.sh b/setenv-embedded.sh index 8e4b0c93..7e743ab8 100755 --- a/setenv-embedded.sh +++ b/setenv-embedded.sh @@ -44,7 +44,8 @@ export CXX="$ARM_EMBEDDED_TOOLCHAIN/$TOOL_PREFIX-g++" export LD="$ARM_EMBEDDED_TOOLCHAIN/$TOOL_PREFIX-ld" export AR="$ARM_EMBEDDED_TOOLCHAIN/$TOOL_PREFIX-ar" export AS="$ARM_EMBEDDED_TOOLCHAIN/$TOOL_PREFIX-as" -export RANLIB="$ARM_EMBEDDED_TOOLCHAIN/$TOOL_PREFIX-gcc-ranlib-4.7" +export RANLIB="$ARM_EMBEDDED_TOOLCHAIN/$TOOL_PREFIX-ranlib" +# export RANLIB="$ARM_EMBEDDED_TOOLCHAIN/$TOOL_PREFIX-gcc-ranlib-4.7" # Test a few of the tools if [ ! -e "$CPP" ]; then @@ -97,7 +98,8 @@ if [ ! -d "$ARM_EMBEDDED_SYSROOT" ]; then fi # Fix C++ header paths for Ubuntu -ARM_EMBEDDED_TOOLCHAIN_VERSION="4.7.3" +# ARM_EMBEDDED_TOOLCHAIN_VERSION="4.7.3" +ARM_EMBEDDED_TOOLCHAIN_VERSION="5.4.0" ARM_EMBEDDED_CXX_HEADERS="$ARM_EMBEDDED_SYSROOT/include/c++/$ARM_EMBEDDED_TOOLCHAIN_VERSION" if [ ! -d "$ARM_EMBEDDED_CXX_HEADERS" ]; then