From 635b5cc00adb999bdfdf5266c99d368e6aeed123 Mon Sep 17 00:00:00 2001 From: wuggy Date: Tue, 30 Jun 2026 06:03:07 +0100 Subject: [PATCH] Update tabs because Python --- js/src/old-configure.in | 17 ++++++++++++++--- old-configure.in | 31 +++++++++++++++---------------- 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/js/src/old-configure.in b/js/src/old-configure.in index 13aac470cf..f3ea36b938 100644 --- a/js/src/old-configure.in +++ b/js/src/old-configure.in @@ -223,10 +223,21 @@ case "$target" in AC_SUBST(MSVC_CXX_RUNTIME_DLL) # Check linker version - _LD_FULL_VERSION=`"${LD}" -v 2>&1 | sed -nre "$_MSVC_VER_FILTER"` - _LD_MAJOR_VERSION=`echo ${_LD_FULL_VERSION} | $AWK -F\. '{ print $1 }'` + _LD_FULL_VERSION=`"${LD}" -v 2>&1` + + # If using lld-link, force version to match clang-cl's MSVC suite (14) + case "$_LD_FULL_VERSION" in + *LLD*) + _LD_MAJOR_VERSION=$_CC_SUITE + ;; + *) + _LD_FULL_VERSION=`echo "$_LD_FULL_VERSION" | sed -nre "$_MSVC_VER_FILTER"` + _LD_MAJOR_VERSION=`echo ${_LD_FULL_VERSION} | $AWK -F\. '{ print $1 }'` + ;; + esac + if test "$_LD_MAJOR_VERSION" != "$_CC_SUITE"; then - AC_MSG_ERROR([The linker major version, $_LD_FULL_VERSION, does not match the compiler suite version, $_CC_SUITE.]) + AC_MSG_ERROR([The linker major version, $_LD_FULL_VERSION, does not match the compiler suite version, $_CC_SUITE.]) fi INCREMENTAL_LINKER=1 diff --git a/old-configure.in b/old-configure.in index 21f4dd8bdd..659010ab84 100644 --- a/old-configure.in +++ b/old-configure.in @@ -255,24 +255,23 @@ case "$target" in WIN32_REDIST_DIR=`cd "$WIN32_REDIST_DIR" && pwd -W` fi -# Check linker version -_LD_FULL_VERSION=`"${LD}" -v 2>&1` + # Check linker version + _LD_FULL_VERSION=`"${LD}" -v 2>&1` -# If using lld-link, force version to match clang-cl's MSVC suite (14) -case "$_LD_FULL_VERSION" in - *LLD*) - _LD_MAJOR_VERSION=$_CC_SUITE - ;; - *) - _LD_FULL_VERSION=`echo "$_LD_FULL_VERSION" | sed -nre "$_MSVC_VER_FILTER"` - _LD_MAJOR_VERSION=`echo ${_LD_FULL_VERSION} | $AWK -F\. '{ print $1 }'` - ;; -esac - -if test "$_LD_MAJOR_VERSION" != "$_CC_SUITE"; then - AC_MSG_ERROR([The linker major version, $_LD_FULL_VERSION, does not match the compiler suite version, $_CC_SUITE.]) -fi + # If using lld-link, force version to match clang-cl's MSVC suite (14) + case "$_LD_FULL_VERSION" in + *LLD*) + _LD_MAJOR_VERSION=$_CC_SUITE + ;; + *) + _LD_FULL_VERSION=`echo "$_LD_FULL_VERSION" | sed -nre "$_MSVC_VER_FILTER"` + _LD_MAJOR_VERSION=`echo ${_LD_FULL_VERSION} | $AWK -F\. '{ print $1 }'` + ;; + esac + if test "$_LD_MAJOR_VERSION" != "$_CC_SUITE"; then + AC_MSG_ERROR([The linker major version, $_LD_FULL_VERSION, does not match the compiler suite version, $_CC_SUITE.]) + fi INCREMENTAL_LINKER=1