From c06a20290f4fa0035eee5cef14e418bc9297c2c5 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Fri, 28 Dec 2018 19:58:50 -0500 Subject: [PATCH 1/3] Set/unset some common CLI environment variables Make sure some other common compilation tools have environment variables set for them as well for easy use. Should aid in migrating to the new toolchain, which provides and sets all of these. --- recipe/activate.sh | 10 ++++++++++ recipe/deactivate.sh | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/recipe/activate.sh b/recipe/activate.sh index c564316..d0d8de5 100644 --- a/recipe/activate.sh +++ b/recipe/activate.sh @@ -3,12 +3,17 @@ if [ "$(uname)" == "Darwin" ] then # for Mac OSX + export AR=ar export CC=clang export CXX=clang++ export FC=gfortran export F77=$FC export F90=$FC export F95=$FC + export LD=ld + export NM=nm + export RANLIB=ranlib + export STRIP=strip export MACOSX_VERSION_MIN="10.9" export MACOSX_DEPLOYMENT_TARGET="${MACOSX_VERSION_MIN}" export CMAKE_OSX_DEPLOYMENT_TARGET="${MACOSX_VERSION_MIN}" @@ -29,12 +34,17 @@ then elif [ "$(uname)" == "Linux" ] then # for Linux + export AR=ar export CC=gcc export CXX=g++ export FC=gfortran export F77=$FC export F90=$FC export F95=$FC + export LD=ld + export NM=nm + export RANLIB=ranlib + export STRIP=strip export CFLAGS="${CFLAGS}" # Boost wants to enable `float128` support on Linux by default. # However, we don't install `libquadmath` so it will fail to find diff --git a/recipe/deactivate.sh b/recipe/deactivate.sh index f84d97c..1eb354a 100644 --- a/recipe/deactivate.sh +++ b/recipe/deactivate.sh @@ -3,12 +3,17 @@ if [ "$(uname)" == "Darwin" ]; then # for Mac OSX + unset AR unset CC unset CXX unset FC unset F77 unset F90 unset F95 + unset LD + unset NM + unset RANLIB + unset STRIP unset MACOSX_VERSION_MIN unset MACOSX_DEPLOYMENT_TARGET unset CMAKE_OSX_DEPLOYMENT_TARGET @@ -21,12 +26,17 @@ then elif [ "$(uname)" == "Linux" ] then # for Linux + unset AR unset CC unset CXX unset FC unset F77 unset F90 unset F95 + unset LD + unset NM + unset RANLIB + unset STRIP unset CFLAGS unset CXXFLAGS unset LDFLAGS From 4ac04dcbd3922512794def272cb85ebfde16b380 Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Fri, 28 Dec 2018 20:00:56 -0500 Subject: [PATCH 2/3] Set/unset common binutils environment variables Includes some common environment variables specifying where to find these command line tools for the legacy toolchain. Should aid in migration to the new toolchain, which both provides these tools and sets environment variables pointing to them. --- recipe/activate.sh | 2 ++ recipe/deactivate.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/recipe/activate.sh b/recipe/activate.sh index d0d8de5..1de4d68 100644 --- a/recipe/activate.sh +++ b/recipe/activate.sh @@ -43,6 +43,8 @@ then export F95=$FC export LD=ld export NM=nm + export OBJCOPY=objcopy + export OBJDUMP=objdump export RANLIB=ranlib export STRIP=strip export CFLAGS="${CFLAGS}" diff --git a/recipe/deactivate.sh b/recipe/deactivate.sh index 1eb354a..526ccaa 100644 --- a/recipe/deactivate.sh +++ b/recipe/deactivate.sh @@ -35,6 +35,8 @@ then unset F95 unset LD unset NM + unset OBJCOPY + unset OBJDUMP unset RANLIB unset STRIP unset CFLAGS From 0a1281325528fba64b6f5deb792aec52416466da Mon Sep 17 00:00:00 2001 From: John Kirkham Date: Fri, 28 Dec 2018 20:02:13 -0500 Subject: [PATCH 3/3] Bump to 2.4.0 Make a new release with the minor version number bumped as we include environment variables pointing to other common toolchain tools to smooth over differences between the legacy and new toolchains thus aiding the migration. --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bbed893..1b49fb4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ package: name: toolchain - version: 2.3.0 + version: 2.4.0 build: number: 0