Revert "Sync setenv scripts"

This reverts commit b225fbf. The new one was overwritten, not the old one.
pull/546/head
Jeffrey Walton 2018-01-20 12:45:05 -05:00
parent b225fbfae7
commit 31c6b236dc
1 changed files with 8 additions and 5 deletions

View File

@ -13,7 +13,7 @@
# See http://www.cryptopp.com/wiki/ARM_Embedded_(Command_Line) for details. # See http://www.cryptopp.com/wiki/ARM_Embedded_(Command_Line) for details.
# ==================================================================== # ====================================================================
set -eu # set -eu
# Unset old options # Unset old options
@ -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
@ -134,8 +136,9 @@ fi
echo echo
echo "*******************************************************************************" echo "*******************************************************************************"
echo "It looks the the environment is set correctly. Your next step is" echo "It looks the the environment is set correctly. Your next step is build"
echo "build the library with 'make -f GNUmakefile-cross'" echo "the library with 'make -f GNUmakefile-cross'. You can create a versioned"
echo "shared object using 'HAS_SOLIB_VERSION=1 make -f GNUmakefile-cross'"
echo "*******************************************************************************" echo "*******************************************************************************"
echo echo