Bug 1689613 - Follow-up: Fix linux32 libotr build by removing --disable-asm. r=mkmelin

Setting the config.h define HAVE_CPU_ARCH_X86 somehow has become dependent on
having asm enabled. --disable-asm needs to go. It is set because of compile
time errors "not in 64-bit mode".

CCASFLAGS is for the assembler. It's supposed to default to $CFLAGS, which
is set up for generating i686 machine code, but that does not seem to be the
case. Setting CCASFLAGS explicitly fixes the "not in 64 bit mode" compiler
errors seen previously, so then --disable-asm is no longer needed.

Differential Revision: https://phabricator.services.mozilla.com/D103557

--HG--
extra : rebase_source : 9f0b797f6304acacd7d2e204219081e32dcec311
extra : amend_source : 459e5ce496616e04956b6544e87449f20cdb3744
extra : histedit_source : e0683e54f172c6f8fb6f056ff8ccdf97f03fa0ff

taskcluster/scripts/build-libotr.sh

@@ -251,6 +251,7 @@ case "${_TARGET_OS}" in
         export _TARGET_TRIPLE="i686-pc-linux"
         export CC="clang"
         export CFLAGS="--target=${_TARGET_TRIPLE} -m32 -march=pentium-m -msse -msse2 -mfpmath=sse"
+        export CCASFLAGS="--target=${_TARGET_TRIPLE} -m32 -march=pentium-m -msse -msse2 -mfpmath=sse"
         export LDFLAGS="--target=${_TARGET_TRIPLE} -m32 -march=pentium-m -msse -msse2 -mfpmath=sse"
 
         export AR=llvm-ar
@@ -263,7 +264,6 @@ case "${_TARGET_OS}" in
         LDFLAGS_otr="-Wl,-Bstatic,-L${_PREFIX}/lib,-lgcrypt,-L${_PREFIX}/lib,-lgpg-error,-Bdynamic"
 
         _OS_CONFIGURE_FLAGS="--host=${_TARGET_TRIPLE} --target=${_TARGET_TRIPLE}"
-        _GCRYPT_CONF_FLAGS="--disable-asm"
         _CONF_STATIC="--enable-static --disable-shared"
         _TARGET_LIBS='lib/libotr.so.5'
         ;;