Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[project] Merge druntime into the dmd repository #8504

Merged
merged 1 commit into from
Jul 9, 2022
Merged

[project] Merge druntime into the dmd repository #8504

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
4 changes: 2 additions & 2 deletions .circleci/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ setup_repos()
git checkout -f FETCH_HEAD
fi

for proj in dmd druntime tools ; do
for proj in dmd tools ; do
if [ "$base_branch" != master ] && [ "$base_branch" != stable ] &&
! git ls-remote --exit-code --heads https://github.com/dlang/$proj.git "$base_branch" > /dev/null; then
# use master as fallback for other repos to test feature branches
Expand All @@ -90,7 +90,7 @@ setup_repos()

# build dmd and druntime
pushd ../dmd && ./src/build.d MODEL=$MODEL HOST_DMD="$DMD" BUILD=$BUILD PIC="$PIC" all && popd
make -j"$N" -C ../druntime -f posix.mak MODEL=$MODEL HOST_DMD="$DMD" BUILD=$BUILD
pushd ../dmd && make -j"$N" -C druntime -f posix.mak MODEL=$MODEL HOST_DMD="$DMD" BUILD=$BUILD && popd
}

# run unittest with coverage
Expand Down
8 changes: 4 additions & 4 deletions posix.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ DEBUGGER=gdb
GIT_HOME=https://github.com/dlang
DMD_DIR=../dmd

include $(DMD_DIR)/src/osmodel.mak
include $(DMD_DIR)/compiler/src/osmodel.mak

ifeq (osx,$(OS))
export MACOSX_DEPLOYMENT_TARGET=10.9
Expand Down Expand Up @@ -67,7 +67,7 @@ endif

# Configurable stuff that's rarely edited
INSTALL_DIR = ../install
DRUNTIME_PATH = ../druntime
DRUNTIME_PATH = ../dmd/druntime
DLANG_ORG_DIR = ../dlang.org
ZIPFILE = phobos.zip
ROOT_OF_THEM_ALL = generated
Expand All @@ -82,10 +82,10 @@ ifneq (,$(DRUNTIME))
CUSTOM_DRUNTIME=1
endif
ifeq (,$(findstring win,$(OS)))
DRUNTIME = $(DRUNTIME_PATH)/generated/$(OS)/$(BUILD)/$(MODEL)/libdruntime.a
DRUNTIME = $(DRUNTIME_PATH)/../generated/$(OS)/$(BUILD)/$(MODEL)/libdruntime.a
DRUNTIMESO = $(basename $(DRUNTIME)).so.a
else
DRUNTIME = $(DRUNTIME_PATH)/lib/druntime.lib
DRUNTIME = $(DRUNTIME_PATH)/../lib/druntime.lib
endif

# Set CC and DMD
Expand Down
2 changes: 1 addition & 1 deletion win32.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ CFLAGS=-mn -6 -r

## Location of druntime tree

DRUNTIME=../druntime
DRUNTIME=../dmd/druntime
DRUNTIMELIB=$(DRUNTIME)/lib/druntime.lib

## Flags for dmd D compiler
Expand Down
2 changes: 1 addition & 1 deletion win64.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ CFLAGS=/O2 /nologo

## Location of druntime tree

DRUNTIME=../druntime
DRUNTIME=../dmd/druntime
DRUNTIMELIB=$(DRUNTIME)/lib/druntime$(MODEL).lib

## Flags for dmd D compiler
Expand Down