mirror of
https://github.com/dlang/dmd.git
synced 2025-04-26 13:10:12 +03:00
run.d: use explicit architecture to build tools (ldc is too dependent on environment)
This commit is contained in:
parent
e8b41b36b3
commit
523dd4b438
3 changed files with 10 additions and 7 deletions
|
@ -48,6 +48,13 @@ msbuild /target:dmd /p:Configuration=%CONFIGURATION% /p:Platform=%PLATFORM% %LDC
|
|||
%DMD% --version
|
||||
grep --version
|
||||
|
||||
rem compile run.d before changing the LIB environment variable
|
||||
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
|
||||
|
||||
cd "%DMD_DIR%\test"
|
||||
"%HOST_DMD%" -m%MODEL% -i run.d || exit /B 6
|
||||
|
||||
set DRUNTIME_TESTS=test_all
|
||||
cd "%DMD_DIR%"
|
||||
if "%C_RUNTIME%" == "mingw" (
|
||||
|
@ -88,12 +95,7 @@ set OS=windows
|
|||
set CC=cl.exe
|
||||
set DMD_MODEL=%PLATFORM%
|
||||
set BUILD=%CONFIGURATION%
|
||||
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
|
||||
|
||||
if "%D_COMPILER%" == "ldc" set RDMD=%LDC_DIR%\bin\rdmd
|
||||
if "%D_COMPILER%" == "dmd" set RDMD=%DMD_DIR%\dmd2\windows\bin\rdmd
|
||||
"%RDMD%" -m%MODEL% run.d || exit /B 6
|
||||
run.exe || exit /B 6
|
||||
|
||||
cd "%DMD_DIR%\..\phobos"
|
||||
REM Check: build phobos unittests
|
||||
|
|
|
@ -79,7 +79,7 @@ jobs:
|
|||
VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\
|
||||
strategy:
|
||||
matrix:
|
||||
x64-debug-ldc:
|
||||
win32-ldc:
|
||||
OS: Win_32
|
||||
MODEL: 32mscoff
|
||||
ARCH: x86
|
||||
|
|
|
@ -236,6 +236,7 @@ void ensureToolsExists(string[string] env, const TestTool[] tools ...)
|
|||
{
|
||||
command = [
|
||||
hostDMD,
|
||||
"-m"~env["MODEL"],
|
||||
"-of"~targetBin,
|
||||
sourceFile
|
||||
] ~ tool.extraArgs;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue