diff --git a/recipe/activate.sh b/recipe/activate.sh index c564316..1de4d68 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,19 @@ 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 OBJCOPY=objcopy + export OBJDUMP=objdump + 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..526ccaa 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,19 @@ 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 OBJCOPY + unset OBJDUMP + unset RANLIB + unset STRIP unset CFLAGS unset CXXFLAGS unset LDFLAGS 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