updating build.bat for better arch detection

agracio · Jun 7, 2024 · a336108 · a336108
1 parent c119cd0
commit a336108
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/double/Edge.js/dotnetcore/coreclrembedding.cs b/src/double/Edge.js/dotnetcore/coreclrembedding.cs
@@ -593,7 +593,6 @@ private bool TryAddAssembly(string assemblyName)
     private static readonly ConcurrentDictionary<string, Tuple<Type, MethodInfo>> Compilers = new();
     private static readonly IList<string> _failedAssemblyResolver = new List<string>();
 
-
     public static void Initialize(IntPtr context, IntPtr exception)
     {
         try

diff --git a/tools/build.bat b/tools/build.bat
@@ -5,6 +5,7 @@ if "%1" equ "" (
     echo e.g. build.bat release "20.12.2"
     exit /b -1
 )
+FOR /F "tokens=* USEBACKQ" %%F IN (`node -p process.arch`) DO (SET ARCH=%%F)
 
 SET FLAVOR=%1
 shift
@@ -27,7 +28,7 @@ if "%1" neq "" (
 if "%VERSIONS%" equ "" set VERSIONS=20.14.0
 pushd %SELF%\..
 
-if "%PROCESSOR_ARCHITECTURE%" == "ARM64" (
+if "%ARCH%" == "arm64" (
     for %%V in (%VERSIONS%) do call :build arm64 arm64 %%V 
 ) else (
     for %%V in (%VERSIONS%) do call :build ia32 x86 %%V 
@@ -70,7 +71,7 @@ if %ERRORLEVEL% neq 0 (
 )
 
 REM Conflict when building arm64 binaries
-if "%PROCESSOR_ARCHITECTURE%" == "ARM64" (
+if "%ARCH%" == "arm64" (
     FOR %%F IN (build\*.vcxproj) DO (
     echo Patch /fp:strict in %%F
     powershell -Command "(Get-Content -Raw %%F) -replace '<FloatingPointModel>Strict</FloatingPointModel>', '<!-- <FloatingPointModel>Strict</FloatingPointModel> -->' | Out-File -Encoding Utf8 %%F"
-Original file line number
+Diff line change
@@ Expand Up / @@ -593,7 +593,6 @@ private bool TryAddAssembly(string assemblyName) @@
         private static readonly ConcurrentDictionary<string, Tuple<Type, MethodInfo>> Compilers = new();
         private static readonly IList<string> _failedAssemblyResolver = new List<string>();
         public static void Initialize(IntPtr context, IntPtr exception)
         {
             try
@@ Expand Down @@