Fix some variables for Ubuntu 16 (GH #565)
parent
cef4fa6683
commit
c8389f89ea
|
|
@ -44,7 +44,8 @@ export CXX="$ARM_EMBEDDED_TOOLCHAIN/$TOOL_PREFIX-g++"
|
||||||
export LD="$ARM_EMBEDDED_TOOLCHAIN/$TOOL_PREFIX-ld"
|
export LD="$ARM_EMBEDDED_TOOLCHAIN/$TOOL_PREFIX-ld"
|
||||||
export AR="$ARM_EMBEDDED_TOOLCHAIN/$TOOL_PREFIX-ar"
|
export AR="$ARM_EMBEDDED_TOOLCHAIN/$TOOL_PREFIX-ar"
|
||||||
export AS="$ARM_EMBEDDED_TOOLCHAIN/$TOOL_PREFIX-as"
|
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
|
# Test a few of the tools
|
||||||
if [ ! -e "$CPP" ]; then
|
if [ ! -e "$CPP" ]; then
|
||||||
|
|
@ -97,7 +98,8 @@ if [ ! -d "$ARM_EMBEDDED_SYSROOT" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Fix C++ header paths for Ubuntu
|
# 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"
|
ARM_EMBEDDED_CXX_HEADERS="$ARM_EMBEDDED_SYSROOT/include/c++/$ARM_EMBEDDED_TOOLCHAIN_VERSION"
|
||||||
|
|
||||||
if [ ! -d "$ARM_EMBEDDED_CXX_HEADERS" ]; then
|
if [ ! -d "$ARM_EMBEDDED_CXX_HEADERS" ]; then
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue