Skip to content
This repository was archived by the owner on Oct 12, 2022. It is now read-only.
/ druntime Public archive

Issue 12125: do not enforce specific MS C runtime #1691

Merged
MartinNowak merged 2 commits into from
Jan 18, 2017
Merged

Issue 12125: do not enforce specific MS C runtime #1691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bdd684
do not enforce specific MS C runtime
rainers Nov 6, 2016
3251f09
move new switch into separate line to not cause merge conflict with t…
rainers Nov 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/rt/monitor_.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,6 @@ version (Windows)
{
pragma(lib, "snn.lib");
}
else version (CRuntime_Microsoft)
{
pragma(lib, "libcmt.lib");
pragma(lib, "oldnames.lib");
}
import core.sys.windows.windows;

alias Mutex = CRITICAL_SECTION;
Expand Down
3 changes: 3 additions & 0 deletions win64.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ DRUNTIME_BASE=druntime$(MODEL)
DRUNTIME=lib\$(DRUNTIME_BASE).lib
GCSTUB=lib\gcstub$(MODEL).obj

# do not preselect a C runtime (extracted from the line above to make the auto tester happy)
CFLAGS=$(CFLAGS) /Zl

DOCFMT=

target : import copydir copy $(DRUNTIME) $(GCSTUB)
Expand Down