From f60d87b7dfed732f15bde583dd6214bb0770cfb2 Mon Sep 17 00:00:00 2001
From: dave caruso <me@paperdave.net>
Date: Wed, 8 May 2024 14:57:15 -0700
Subject: [PATCH] chore: fix the build scripts again (#10912)

Co-authored-by: Jarred Sumner <jarred@jarredsumner.com>
---
 scripts/build-libarchive.ps1 |  2 +-
 scripts/env.ps1              | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/scripts/build-libarchive.ps1 b/scripts/build-libarchive.ps1
index 9d6c1a145f..3c562c5f05 100644
--- a/scripts/build-libarchive.ps1
+++ b/scripts/build-libarchive.ps1
@@ -6,7 +6,7 @@ try {
   Set-Location (mkdir -Force build)
 
   Run cmake @CMAKE_FLAGS -DBUILD_SHARED_LIBS=OFF -DENABLE_TEST=OFF -DENABLE_INSTALL=OFF -DENABLE_WERROR=0 -DENABLE_ICONV=0 -DENABLE_LibGCC=0 -DENABLE_LZMA=0 -DENABLE_LZ4=0 -DENABLE_LIBXML2=0 -DENABLE_LIBB2=0 -DENABLE_OPENSSL=0 -DENABLE_CAT=0 ..
-  Run cmake  --build . --clean-first --config Release
+  Run cmake  --build . --clean-first --config Release --verbose
 
   Copy-Item libarchive\archive_static.lib $BUN_DEPS_OUT_DIR\archive.lib
   Write-Host "-> archive.lib"
diff --git a/scripts/env.ps1 b/scripts/env.ps1
index 1869ffc1e3..784db447dc 100644
--- a/scripts/env.ps1
+++ b/scripts/env.ps1
@@ -50,18 +50,18 @@ $CFLAGS = '/O2'
 $CXXFLAGS = '/O2'
 # $CXXFLAGS = '/O2 /MT'
 
-if ($Baseline) {
-  $CFLAGS += ' -march=nehalem'
-  $CXXFLAGS += ' -march=nehalem'
-}
+$CPU_NAME = if ($Baseline) { "nehalem" } else { "haswell" };
+
+$CFLAGS += " -march=${CPU_NAME}"
+$CXXFLAGS += " -march=${CPU_NAME}"
 
 $CMAKE_FLAGS = @(
   "-GNinja",
   "-DCMAKE_BUILD_TYPE=Release",
   "-DCMAKE_C_COMPILER=$CC",
   "-DCMAKE_CXX_COMPILER=$CXX",
-  "-DCMAKE_C_FLAGS=`"$CFLAGS`"",
-  "-DCMAKE_CXX_FLAGS=`"$CXXFLAGS`""
+  "-DCMAKE_C_FLAGS=$CFLAGS",
+  "-DCMAKE_CXX_FLAGS=$CXXFLAGS"
 )
 $env:CC = "clang-cl"
 $env:CXX = "clang-cl"
@@ -86,9 +86,10 @@ function Run() {
   $command = $args[0]
   $commandArgs = @()
   if ($args.Count -gt 1) {
-    $commandArgs = $args[1..($args.Count - 1)]
+    $commandArgs = @($args[1..($args.Count - 1)] | % {$_})
   }
 
+  write-host "> $command $commandArgs"
   & $command $commandArgs
   $result = $LASTEXITCODE