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

Make win32.mak compatible with MODEL=32omf #3703

Merged
dlang-bot merged 1 commit into from
Jan 25, 2022
Merged

Make win32.mak compatible with MODEL=32omf #3703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
ARCH: x64
x86-OMF:
OS: Win_32
MODEL: 32
MODEL: 32omf
ARCH: x86
steps:
- checkout: self
Expand Down
14 changes: 7 additions & 7 deletions win32.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Makefile to build D runtime library druntime.lib for Win32

MODEL=32
MODEL=32omf

DMD_DIR=..\dmd
BUILD=release
OS=windows
DMD=$(DMD_DIR)\generated\$(OS)\$(BUILD)\$(MODEL)\dmd
DMD=$(DMD_DIR)\generated\$(OS)\$(BUILD)\32\dmd

CC=dmc
MAKE=make
Expand Down Expand Up @@ -45,13 +45,13 @@ OBJS_TO_DELETE= errno_c_$(MODEL).obj
######################## Header file generation ##############################

import:
"$(MAKE)" -f mak/WINDOWS import DMD="$(DMD)" HOST_DMD="$(HOST_DMD)" MODEL=$(MODEL) IMPDIR="$(IMPDIR)"
"$(MAKE)" -f mak/WINDOWS import DMD="$(DMD)" HOST_DMD="$(HOST_DMD)" MODEL=32 IMPDIR="$(IMPDIR)"

copydir:
"$(MAKE)" -f mak/WINDOWS copydir HOST_DMD="$(HOST_DMD)" MODEL=$(MODEL) IMPDIR="$(IMPDIR)"
"$(MAKE)" -f mak/WINDOWS copydir HOST_DMD="$(HOST_DMD)" MODEL=32 IMPDIR="$(IMPDIR)"

copy:
"$(MAKE)" -f mak/WINDOWS copy DMD="$(DMD)" HOST_DMD="$(HOST_DMD)" MODEL=$(MODEL) IMPDIR="$(IMPDIR)"
"$(MAKE)" -f mak/WINDOWS copy DMD="$(DMD)" HOST_DMD="$(HOST_DMD)" MODEL=32 IMPDIR="$(IMPDIR)"

################### Win32 Import Libraries ###################

Expand Down Expand Up @@ -105,7 +105,7 @@ rebuild_minit_obj: src\rt\minit.asm

################### Library generation #########################

$(DRUNTIME): $(OBJS) $(SRCS) win$(MODEL).mak
$(DRUNTIME): $(OBJS) $(SRCS) win32.mak
*$(DMD) -lib -of$(DRUNTIME) -Xfdruntime.json $(DFLAGS) $(SRCS) $(OBJS)

################### Unittests #########################
Expand All @@ -117,7 +117,7 @@ unittest: unittest.obj
@echo "Unittests cannot be linked on Win32 + OMF due to OPTLINK issues"

# Split compilation into a different step to avoid unnecessary rebuilds
unittest.obj: $(SRCS) win$(MODEL).mak
unittest.obj: $(SRCS) win32.mak
*$(DMD) $(UDFLAGS) $(UTFLAGS) -c -of$@ $(SRCS)

################### tests ######################################
Expand Down