From 49b71b95b9cf4e0f05a3633585dec2503641e542 Mon Sep 17 00:00:00 2001
From: Martin Kinkelin <noone@nowhere.com>
Date: Fri, 15 Dec 2023 02:43:24 +0100
Subject: [PATCH] GitHub Actions: Fix up C++ interop tests job on Windows

---
 .github/workflows/runnable_cxx.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/runnable_cxx.yml b/.github/workflows/runnable_cxx.yml
index b8abdaaaca..bf31a8a374 100644
--- a/.github/workflows/runnable_cxx.yml
+++ b/.github/workflows/runnable_cxx.yml
@@ -312,6 +312,7 @@ jobs:
       run: |
         echo "VISUAL_STUDIO_LIB_NOT_DM=$(which lib.exe)" >> $GITHUB_ENV
         echo "HOST_DMD=${{ env.DC }}" >> $GITHUB_ENV
+        echo "GNU_MAKE=$(which make.exe)" >> $GITHUB_ENV
         echo "${{ github.workspace }}/tools/dm/bin/" >> $GITHUB_PATH
 
     ########################################
@@ -343,11 +344,10 @@ jobs:
         # Note: Only CC for druntime and AR for Phobos are required ATM,
         # but providing all three to avoid surprise for future contributors
         # Those should really be in the path, though.
-        cd dmd/druntime
-        make -f win64.mak
+        "$GNU_MAKE" -j2 -C dmd/druntime
         if [ $? -ne 0 ]; then return 1; fi
-        cd ../../phobos/
-        make -f win64.mak CC=cl.exe LD=link "AR=$VISUAL_STUDIO_LIB_NOT_DM"
+        cd phobos/
+        make -f win64.mak CC=cl.exe LD=link "AR=$VISUAL_STUDIO_LIB_NOT_DM" "DRUNTIMELIB=../dmd/generated/windows/release/64/druntime.lib"
         if [ $? -ne 0 ]; then return 1; fi
         cd ../
 
@@ -370,8 +370,7 @@ jobs:
       if: runner.os == 'Windows'
       shell: bash
       run: |
-        cd dmd/druntime
-        make -f win64.mak test_stdcpp CC=cl.exe LD=link "AR=$VISUAL_STUDIO_LIB_NOT_DM"
+        "$GNU_MAKE" -j2 -C dmd/druntime test/stdcpp/.run CC=cl.exe LD=link "AR=$VISUAL_STUDIO_LIB_NOT_DM"
         if [ $? -ne 0 ]; then return 1; fi
 
     ########################################