mirror of
https://github.com/dlang/dmd.git
synced 2025-04-26 13:10:12 +03:00
druntime: Merge test/stdcpp/win64.mak into Makefile
This commit is contained in:
parent
b99b9d2c20
commit
28cbd2fe8f
7 changed files with 76 additions and 92 deletions
|
@ -24,10 +24,7 @@ set LDC_DIR=%DMD_DIR%\ldc2-%LDC_VERSION%-windows-multilib
|
|||
if "%D_COMPILER%" == "ldc" set HOST_DMD=%LDC_DIR%\bin\ldmd2.exe
|
||||
if "%D_COMPILER%" == "dmd" set HOST_DMD=%DMD_DIR%\dmd2\windows\bin\dmd.exe
|
||||
|
||||
REM take the first found cl.exe, in case there was already one in the path when vcvarsall.bat was called
|
||||
FOR /F "tokens=* USEBACKQ" %%F IN (`where cl.exe`) DO (SET MSVC_CC=%%~fsF
|
||||
goto CC_DONE)
|
||||
:CC_DONE
|
||||
set MSVC_CC=cl.exe
|
||||
FOR /F "tokens=* USEBACKQ" %%F IN (`where lib.exe`) DO (SET MSVC_AR=%%~fsF)
|
||||
|
||||
REM add grep to PATH
|
||||
|
|
|
@ -35,7 +35,7 @@ if [ "$MODEL" == "32omf" ] ; then
|
|||
AR="$PWD/dm/bin/lib.exe"
|
||||
export CPPCMD="$PWD/dm/bin/sppn.exe"
|
||||
else
|
||||
CC="$(where cl.exe)"
|
||||
CC="cl.exe"
|
||||
AR="$(where lib.exe)" # must be done before installing dmd
|
||||
fi
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue