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

explicitly disable using a conf file during the build #1167

Merged
MartinNowak merged 1 commit into from
Feb 13, 2015
Merged

explicitly disable using a conf file during the build #1167

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
10 changes: 5 additions & 5 deletions posix.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ else
DOTLIB:=.a
endif

DFLAGS=$(MODEL_FLAG) -O -release -dip25 -inline -w -Isrc -Iimport $(PIC)
UDFLAGS=$(MODEL_FLAG) -O -release -dip25 -w -Isrc -Iimport $(PIC)
DDOCFLAGS=-c -w -o- -Isrc -Iimport -version=CoreDdoc
DFLAGS=$(MODEL_FLAG) -conf= -O -release -dip25 -inline -w -Isrc -Iimport $(PIC)
UDFLAGS=$(MODEL_FLAG) -conf= -O -release -dip25 -w -Isrc -Iimport $(PIC)
DDOCFLAGS=-conf= -c -w -o- -Isrc -Iimport -version=CoreDdoc

CFLAGS=$(MODEL_FLAG) -O $(PIC)
ifeq (solaris,$(OS))
Expand Down Expand Up @@ -136,7 +136,7 @@ import: $(IMPORTS)

$(IMPDIR)/core/sync/%.di : src/core/sync/%.d
@mkdir -p `dirname $@`
$(DMD) -c -o- -Isrc -Iimport -Hf$@ $<
$(DMD) -conf= -c -o- -Isrc -Iimport -Hf$@ $<

######################## Header .di file copy ##############################

Expand Down Expand Up @@ -175,7 +175,7 @@ $(DRUNTIMESO): $(OBJS) $(SRCS)

$(DRUNTIMESOLIB): $(OBJS) $(SRCS)
$(DMD) -c -fPIC -of$(DRUNTIMESOOBJ) $(DFLAGS) $(SRCS)
$(DMD) -lib -of$(DRUNTIMESOLIB) $(DRUNTIMESOOBJ) $(OBJS)
$(DMD) -conf= -lib -of$(DRUNTIMESOLIB) $(DRUNTIMESOOBJ) $(OBJS)

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

Expand Down
20 changes: 10 additions & 10 deletions win32.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ CC=dmc
DOCDIR=doc
IMPDIR=import

DFLAGS=-m$(MODEL) -O -release -dip25 -inline -w -Isrc -Iimport
UDFLAGS=-m$(MODEL) -O -release -dip25 -w -Isrc -Iimport
DDOCFLAGS=-c -w -o- -Isrc -Iimport -version=CoreDdoc
DFLAGS=-m$(MODEL) -conf= -O -release -dip25 -inline -w -Isrc -Iimport
UDFLAGS=-m$(MODEL) -conf= -O -release -dip25 -w -Isrc -Iimport
DDOCFLAGS=-conf= -c -w -o- -Isrc -Iimport -version=CoreDdoc

CFLAGS=

Expand Down Expand Up @@ -109,25 +109,25 @@ $(DOCDIR)\core_sync_semaphore.html : src\core\sync\semaphore.d
import: $(IMPORTS)

$(IMPDIR)\core\sync\barrier.di : src\core\sync\barrier.d
$(DMD) -c -o- -Isrc -Iimport -Hf$@ $**
$(DMD) -conf= -c -o- -Isrc -Iimport -Hf$@ $**

$(IMPDIR)\core\sync\condition.di : src\core\sync\condition.d
$(DMD) -c -o- -Isrc -Iimport -Hf$@ $**
$(DMD) -conf= -c -o- -Isrc -Iimport -Hf$@ $**

$(IMPDIR)\core\sync\config.di : src\core\sync\config.d
$(DMD) -c -o- -Isrc -Iimport -Hf$@ $**
$(DMD) -conf= -c -o- -Isrc -Iimport -Hf$@ $**

$(IMPDIR)\core\sync\exception.di : src\core\sync\exception.d
$(DMD) -c -o- -Isrc -Iimport -Hf$@ $**
$(DMD) -conf= -c -o- -Isrc -Iimport -Hf$@ $**

$(IMPDIR)\core\sync\mutex.di : src\core\sync\mutex.d
$(DMD) -c -o- -Isrc -Iimport -Hf$@ $**
$(DMD) -conf= -c -o- -Isrc -Iimport -Hf$@ $**

$(IMPDIR)\core\sync\rwmutex.di : src\core\sync\rwmutex.d
$(DMD) -c -o- -Isrc -Iimport -Hf$@ $**
$(DMD) -conf= -c -o- -Isrc -Iimport -Hf$@ $**

$(IMPDIR)\core\sync\semaphore.di : src\core\sync\semaphore.d
$(DMD) -c -o- -Isrc -Iimport -Hf$@ $**
$(DMD) -conf= -c -o- -Isrc -Iimport -Hf$@ $**

######################## Header .di file copy ##############################

Expand Down
20 changes: 10 additions & 10 deletions win64.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ CP=cp
DOCDIR=doc
IMPDIR=import

DFLAGS=-m$(MODEL) -O -release -dip25 -inline -w -Isrc -Iimport
UDFLAGS=-m$(MODEL) -O -release -dip25 -w -Isrc -Iimport
DDOCFLAGS=-c -w -o- -Isrc -Iimport -version=CoreDdoc
DFLAGS=-m$(MODEL) -conf= -O -release -dip25 -inline -w -Isrc -Iimport
UDFLAGS=-m$(MODEL) -conf= -O -release -dip25 -w -Isrc -Iimport
DDOCFLAGS=-conf= -c -w -o- -Isrc -Iimport -version=CoreDdoc

#CFLAGS=/O2 /I"$(VCDIR)"\INCLUDE /I"$(SDKDIR)"\Include
CFLAGS=/Z7 /I"$(VCDIR)"\INCLUDE /I"$(SDKDIR)"\Include
Expand Down Expand Up @@ -116,25 +116,25 @@ $(DOCDIR)\core_sync_semaphore.html : src\core\sync\semaphore.d
import: $(IMPORTS)

$(IMPDIR)\core\sync\barrier.di : src\core\sync\barrier.d
$(DMD) -c -o- -Isrc -Iimport -Hf$@ $**
$(DMD) -conf= -c -o- -Isrc -Iimport -Hf$@ $**

$(IMPDIR)\core\sync\condition.di : src\core\sync\condition.d
$(DMD) -c -o- -Isrc -Iimport -Hf$@ $**
$(DMD) -conf= -c -o- -Isrc -Iimport -Hf$@ $**

$(IMPDIR)\core\sync\config.di : src\core\sync\config.d
$(DMD) -c -o- -Isrc -Iimport -Hf$@ $**
$(DMD) -conf= -c -o- -Isrc -Iimport -Hf$@ $**

$(IMPDIR)\core\sync\exception.di : src\core\sync\exception.d
$(DMD) -c -o- -Isrc -Iimport -Hf$@ $**
$(DMD) -conf= -c -o- -Isrc -Iimport -Hf$@ $**

$(IMPDIR)\core\sync\mutex.di : src\core\sync\mutex.d
$(DMD) -c -o- -Isrc -Iimport -Hf$@ $**
$(DMD) -conf= -c -o- -Isrc -Iimport -Hf$@ $**

$(IMPDIR)\core\sync\rwmutex.di : src\core\sync\rwmutex.d
$(DMD) -c -o- -Isrc -Iimport -Hf$@ $**
$(DMD) -conf= -c -o- -Isrc -Iimport -Hf$@ $**

$(IMPDIR)\core\sync\semaphore.di : src\core\sync\semaphore.d
$(DMD) -c -o- -Isrc -Iimport -Hf$@ $**
$(DMD) -conf= -c -o- -Isrc -Iimport -Hf$@ $**

######################## Header .di file copy ##############################

Expand Down