From f7558c16aaf6cf47f1c4136b0bcee6845a921988 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 8 Mar 2017 16:06:54 +0100 Subject: [PATCH] common: lost the FCC to FC change somehow Should now be conforming to GNU make. --- common/xbps-src/shutils/common.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh index 56db881f5b3..0f140f03481 100644 --- a/common/xbps-src/shutils/common.sh +++ b/common/xbps-src/shutils/common.sh @@ -394,7 +394,7 @@ setup_pkg() { export CC_FOR_BUILD="cc" export CXX_FOR_BUILD="g++" export CPP_FOR_BUILD="cpp" - export FCC_FOR_BUILD="gfortran" + export FC_FOR_BUILD="gfortran" export LD_FOR_BUILD="ld" export CFLAGS_FOR_BUILD="$XBPS_CFLAGS" export CXXFLAGS_FOR_BUILD="$XBPS_CXXFLAGS" @@ -407,7 +407,7 @@ setup_pkg() { export CC="${XBPS_CROSS_TRIPLET}-gcc" export CXX="${XBPS_CROSS_TRIPLET}-c++" export CPP="${XBPS_CROSS_TRIPLET}-cpp" - export FCC="${XBPS_CROSS_TRIPLET}-gfortran" + export FC="${XBPS_CROSS_TRIPLET}-gfortran" export GCC="$CC" export LD="${XBPS_CROSS_TRIPLET}-ld" export AR="${XBPS_CROSS_TRIPLET}-ar" @@ -423,7 +423,7 @@ setup_pkg() { export CXX_target="$CXX" export CPP_target="$CPP" export GCC_target="$GCC" - export FCC_target="$FCC" + export FC_target="$FC" export LD_target="$LD" export AR_target="$AR" export AS_target="$AS" @@ -443,7 +443,7 @@ setup_pkg() { export CXX_host="g++" export CPP_host="cpp" export GCC_host="$CC_host" - export FCC_host="gfortran" + export FC_host="gfortran" export LD_host="ld" export AR_host="ar" export AS_host="as" @@ -463,7 +463,7 @@ setup_pkg() { export CXX="g++" export CPP="cpp" export GCC="$CC" - export FCC="gfortran" + export FC="gfortran" export LD="ld" export AR="ar" export AS="as" @@ -474,10 +474,10 @@ setup_pkg() { export NM="nm" export READELF="readelf" # Unse cross evironment variables - unset CC_target CXX_target CPP_target GCC_target FCC_target LD_target AR_target AS_target + unset CC_target CXX_target CPP_target GCC_target FC_target LD_target AR_target AS_target unset RANLIB_target STRIP_target OBJDUMP_target OBJCOPY_target NM_target READELF_target unset CFLAGS_target CXXFLAGS_target CPPFLAGS_target LDFLAGS_target - unset CC_host CXX_host CPP_host GCC_host FCC_host LD_host AR_host AS_host + unset CC_host CXX_host CPP_host GCC_host FC_host LD_host AR_host AS_host unset RANLIB_host STRIP_host OBJDUMP_host OBJCOPY_host NM_host READELF_host unset CFLAGS_host CXXFLAGS_host CPPFLAGS_host LDFLAGS_host fi