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

Jump to bottom

*.mak: Change the meaning of DMD_DIR to the path of the compiler source #8820

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

*.mak: Change the meaning of DMD_DIR to the path of the compiler source #8820

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
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 @@ -32,9 +32,9 @@ QUIET:=@

DEBUGGER=gdb
GIT_HOME=https://github.com/dlang
DMD_DIR=../dmd
DMD_DIR=../dmd/compiler

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

ifeq (osx,$(OS))
export MACOSX_DEPLOYMENT_TARGET=10.9
Expand Down Expand Up @@ -94,7 +94,7 @@ ifeq ($(OS),win32wine)
DMD = wine dmd.exe
RUN = wine
else
DMD = $(DMD_DIR)/generated/$(OS)/$(BUILD)/$(MODEL)/dmd
DMD = $(DMD_DIR)/../generated/$(OS)/$(BUILD)/$(MODEL)/dmd
ifeq ($(OS),win32)
CC = dmc
else
Expand Down Expand Up @@ -182,7 +182,7 @@ LINKDL:=$(if $(findstring $(OS),linux),-L-ldl,)
TIMELIMIT:=$(if $(shell which timelimit 2>/dev/null || true),timelimit -t 90 ,)

# Set VERSION, where the file is that contains the version string
VERSION=$(DMD_DIR)/VERSION
VERSION=$(DMD_DIR)/../VERSION

# Set LIB, the ultimate target
ifeq (,$(findstring win,$(OS)))
Expand Down
4 changes: 2 additions & 2 deletions win32.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ MAKE=make

## D compiler

DMD_DIR=../dmd
DMD_DIR=../dmd/compiler
BUILD=release
OS=windows
DMD=$(DMD_DIR)/generated/$(OS)/$(BUILD)/32/dmd
DMD=$(DMD_DIR)/../generated/$(OS)/$(BUILD)/32/dmd

## Zlib library

Expand Down
4 changes: 2 additions & 2 deletions win64.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@ UDFLAGS=-conf= -g -m$(MODEL) -O -w -preview=dip1000 -preview=fieldwise -I$(DRUNT

## D compiler

DMD_DIR=../dmd
DMD_DIR=../dmd/compiler
BUILD=release
OS=windows
DMD=$(DMD_DIR)/generated/$(OS)/$(BUILD)/$(MODEL)/dmd
DMD=$(DMD_DIR)/../generated/$(OS)/$(BUILD)/$(MODEL)/dmd

## Zlib library

Expand Down
Loading