Attachment #263125 for bug #355527

Lines 8-13 Link Here

(-)dmd2/src/phobos/etc/c/zlib/gzio.c.orig (+1 lines)
8	/* @(#) $Id$ */	8	/* @(#) $Id$ */
9		9
10	#include <stdio.h>	10	#include <stdio.h>
		11	#include <errno.h>
11		12
12	#include "zutil.h"	13	#include "zutil.h"
13		14




DOCDIR=doc
IMPDIR=import

MODEL?=32

DFLAGS=-m$(MODEL) -O -release -inline -nofloat -w -d -Isrc -Iimport 
UDFLAGS=-m$(MODEL) -O -release -nofloat -w -d -Isrc -Iimport 

CFLAGS=-m$(MODEL) -O

OBJDIR=obj$(MODEL)
DRUNTIME_BASE=druntime
DRUNTIME=lib$(MODEL)/lib$(DRUNTIME_BASE).a

DOCFMT=





TK=tk
ROOT=root

MODEL?=32

CC=g++ -m$(MODEL)

#OPT=-g -g3
#OPT=-O2

all: dmd

dmd: $(DMD_OBJS)
	gcc -m$(MODEL) -lstdc++ -lpthread $(COV) $(DMD_OBJS) -o dmd

clean:
	rm -f $(DMD_OBJS) dmd optab.o id.o impcnvgen idgen id.c id.h \

	$(CC) -c $(GFLAGS) -I$(ROOT) $<

strtold.o: $C/strtold.c
	gcc -m$(MODEL) -c $C/strtold.c

struct.o: struct.c
	$(CC) -c $(CFLAGS) $<

Lines 48-54 Link Here

(-)dmd2/src/phobos/posix.mak.orig (-2 / +2 lines)
48	DRUNTIME_PATH = ../druntime	48	DRUNTIME_PATH = ../druntime
49	ZIPFILE = phobos.zip	49	ZIPFILE = phobos.zip
50	ROOT_OF_THEM_ALL = generated	50	ROOT_OF_THEM_ALL = generated
51	ROOT = $(ROOT_OF_THEM_ALL)/$(OS)/$(BUILD)/$(MODEL)	51	ROOT = $(ROOT_OF_THEM_ALL)/$(OS)/$(BUILD)$(MODEL)
52	# Documentation-related stuff	52	# Documentation-related stuff
53	DOCSRC = ../d-programming-language.org	53	DOCSRC = ../d-programming-language.org
54	WEBSITE_DIR = ../web	54	WEBSITE_DIR = ../web
Lines 73-79 Link Here
73		73
74	# Set DRUNTIME name and full path	74	# Set DRUNTIME name and full path
75	ifeq (,$(findstring win,$(OS)))	75	ifeq (,$(findstring win,$(OS)))
76	DRUNTIME = $(DRUNTIME_PATH)/lib/libdruntime.a	76	DRUNTIME = $(DRUNTIME_PATH)/lib$(MODEL)/libdruntime.a
77	else	77	else
78	DRUNTIME = $(DRUNTIME_PATH)/lib/druntime.lib	78	DRUNTIME = $(DRUNTIME_PATH)/lib/druntime.lib
79	endif	79	endif

Lines 3-9 Link Here

(-)dmd2/src/druntime/posix.mak.orig (-1 / +1 lines)
3	# pkg_add -r gmake	3	# pkg_add -r gmake
4	# and then run as gmake rather than make.	4	# and then run as gmake rather than make.
5		5
6	DMD=dmd	6	DMD?=dmd
7		7
8	DOCDIR=doc	8	DOCDIR=doc
9	IMPDIR=import	9	IMPDIR=import





# Variable defined in an OS-dependent manner (see below)
CC =
DMD =
DDOC =
CFLAGS =
DFLAGS =


# Set CC and DMD
ifeq ($(OS),win32wine)
	CC = wine $(HOME)/dmc/bin/dmc.exe
	DMD ?= wine $(HOME)/dmd2/windows/bin/dmd.exe
	RUN = wine
else
	ifeq ($(OS),win32remote)
		DMD ?= ssh 206.125.170.138 "cd code/dmd/phobos && dmd"
		CC = ssh 206.125.170.138 "cd code/dmd/phobos && dmc"
	else
		DMD ?= dmd
		ifeq ($(OS),win32)
			CC = dmc
		else

endif

# Set DDOC, the documentation generator
DDOC?=$(DMD)

# Set LIB, the ultimate target
ifeq (,$(findstring win,$(OS)))

Return to bug 355527

Lines 3-11 Link Here

(-)dmd2/src/dmd/linux.mak.orig (-4 / +4 lines)
3	TK=tk	3	TK=tk
4	ROOT=root	4	ROOT=root
5		5
6	MODEL=-m32	6	MODEL?=32
7		7
8	CC=g++ $(MODEL)	8	CC=g++ -m$(MODEL)
9		9
10	#OPT=-g -g3	10	#OPT=-g -g3
11	#OPT=-O2	11	#OPT=-O2
Lines 94-100 Link Here
94	all: dmd	94	all: dmd
95		95
96	dmd: $(DMD_OBJS)	96	dmd: $(DMD_OBJS)
97	gcc $(MODEL) -lstdc++ -lpthread $(COV) $(DMD_OBJS) -o dmd	97	gcc -m$(MODEL) -lstdc++ -lpthread $(COV) $(DMD_OBJS) -o dmd
98		98
99	clean:	99	clean:
100	rm -f $(DMD_OBJS) dmd optab.o id.o impcnvgen idgen id.c id.h \	100	rm -f $(DMD_OBJS) dmd optab.o id.o impcnvgen idgen id.c id.h \
Lines 467-473 Link Here
467	$(CC) -c $(GFLAGS) -I$(ROOT) $<	467	$(CC) -c $(GFLAGS) -I$(ROOT) $<
468		468
469	strtold.o: $C/strtold.c	469	strtold.o: $C/strtold.c
470	gcc $(MODEL) -c $C/strtold.c	470	gcc -m$(MODEL) -c $C/strtold.c
471		471
472	struct.o: struct.c	472	struct.o: struct.c
473	$(CC) -c $(CFLAGS) $<	473	$(CC) -c $(CFLAGS) $<

Lines 59-66 Link Here

(-)dmd2/src/phobos/posix.mak.orig (-6 / +4 lines)
59		59
60	# Variable defined in an OS-dependent manner (see below)	60	# Variable defined in an OS-dependent manner (see below)
61	CC =	61	CC =
62	DMD =
63	DDOC =
64	CFLAGS =	62	CFLAGS =
65	DFLAGS =	63	DFLAGS =
66		64
Lines 81-94 Link Here
81	# Set CC and DMD	79	# Set CC and DMD
82	ifeq ($(OS),win32wine)	80	ifeq ($(OS),win32wine)
83	CC = wine $(HOME)/dmc/bin/dmc.exe	81	CC = wine $(HOME)/dmc/bin/dmc.exe
84	DMD = wine $(HOME)/dmd2/windows/bin/dmd.exe	82	DMD ?= wine $(HOME)/dmd2/windows/bin/dmd.exe
85	RUN = wine	83	RUN = wine
86	else	84	else
87	ifeq ($(OS),win32remote)	85	ifeq ($(OS),win32remote)
88	DMD = ssh 206.125.170.138 "cd code/dmd/phobos && dmd"	86	DMD ?= ssh 206.125.170.138 "cd code/dmd/phobos && dmd"
89	CC = ssh 206.125.170.138 "cd code/dmd/phobos && dmc"	87	CC = ssh 206.125.170.138 "cd code/dmd/phobos && dmc"
90	else	88	else
91	DMD = dmd	89	DMD ?= dmd
92	ifeq ($(OS),win32)	90	ifeq ($(OS),win32)
93	CC = dmc	91	CC = dmc
94	else	92	else
Lines 139-145 Link Here
139	endif	137	endif
140		138
141	# Set DDOC, the documentation generator	139	# Set DDOC, the documentation generator
142	DDOC=dmd	140	DDOC?=$(DMD)
143		141
144	# Set LIB, the ultimate target	142	# Set LIB, the ultimate target
145	ifeq (,$(findstring win,$(OS)))	143	ifeq (,$(findstring win,$(OS)))

Lines 8-23 Link Here

(-)dmd2/src/druntime/posix.mak.orig (-3 / +3 lines)
8	DOCDIR=doc	8	DOCDIR=doc
9	IMPDIR=import	9	IMPDIR=import
10		10
11	MODEL=32	11	MODEL?=32
12		12
13	DFLAGS=-m$(MODEL) -O -release -inline -nofloat -w -d -Isrc -Iimport	13	DFLAGS=-m$(MODEL) -O -release -inline -nofloat -w -d -Isrc -Iimport
14	UDFLAGS=-m$(MODEL) -O -release -nofloat -w -d -Isrc -Iimport	14	UDFLAGS=-m$(MODEL) -O -release -nofloat -w -d -Isrc -Iimport
15		15
16	CFLAGS=-m$(MODEL) -O	16	CFLAGS=-m$(MODEL) -O
17		17
18	OBJDIR=obj	18	OBJDIR=obj$(MODEL)
19	DRUNTIME_BASE=druntime	19	DRUNTIME_BASE=druntime
20	DRUNTIME=lib/lib$(DRUNTIME_BASE).a	20	DRUNTIME=lib$(MODEL)/lib$(DRUNTIME_BASE).a
21		21
22	DOCFMT=	22	DOCFMT=
23		23