From bb8970c37215aaa6ec205585e3a063337baa6bed Mon Sep 17 00:00:00 2001 From: Javernaut Date: Mon, 20 Apr 2020 18:52:02 +0300 Subject: [PATCH] Using clang as AS even when gnu binutils are selected --- scripts/export-build-variables.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/scripts/export-build-variables.sh b/scripts/export-build-variables.sh index 304ab54..843bd70 100755 --- a/scripts/export-build-variables.sh +++ b/scripts/export-build-variables.sh @@ -80,13 +80,7 @@ export TARGET=${TARGET_TRIPLE_MACHINE_CC}-linux-${TARGET_TRIPLE_OS}${ANDROID_PLA export FAM_CC=${TOOLCHAIN_PATH}/bin/${TARGET}-clang export FAM_CXX=${FAM_CC}++ export FAM_LD=${FAM_CC} - -if [ $DESIRED_BINUTILS = "gnu" ] ; then - export FAM_AS=${CROSS_PREFIX_WITH_PATH}as -else - # The llvm-as stucks in the beginning of FFmpeg's configure script, so use clang - export FAM_AS=${FAM_CC} -fi +export FAM_AS=${FAM_CC} # TODO consider abondaning this strategy of defining the name of the clang wrapper # in favour of just passing -mstackrealign and -fno-addrsig depending on