Attachment #262995 for bug #355527




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=


Lines 21-32 Link Here

(-)./dmd2/src/phobos/linux.mak.orig (-3 / +12 lines)
21	#	21	#
22	# OS can be posix, win32, win32remote, win32wine, or osx	22	# OS can be posix, win32, win32remote, win32wine, or osx
23	OS = posix	23	OS = posix
		24	MODEL ?= 32
		25
		26	ifeq (,$(findstring $(MODEL),32 64))
		27	$(error "MODEL=$(MODEL) isn't supported")
		28	endif
		29
24		30
25	# Configurable stuff that's rarely edited	31	# Configurable stuff that's rarely edited
26	DRUNTIME_PATH = ../druntime	32	DRUNTIME_PATH = ../druntime
27	ZIPFILE = phobos.zip	33	ZIPFILE = phobos.zip
28	ROOT_OF_THEM_ALL = generated	34	ROOT_OF_THEM_ALL = generated
29	ROOT = $(ROOT_OF_THEM_ALL)/$(OS)/$(BUILD)	35	ROOT = $(ROOT_OF_THEM_ALL)/$(OS)/$(BUILD)$(MODEL)
30	# Documentation-related stuff	36	# Documentation-related stuff
31	DOCSRC = ../docsrc	37	DOCSRC = ../docsrc
32	DOC_OUTPUT_DIR = ../web/2.0/phobos	38	DOC_OUTPUT_DIR = ../web/2.0/phobos
Lines 51-58 Link Here
51		57
52	# Set DRUNTIME name and full path	58	# Set DRUNTIME name and full path
53	ifeq (,$(findstring win,$(OS)))	59	ifeq (,$(findstring win,$(OS)))
54	DRUNTIME = $(DRUNTIME_PATH)/lib/libdruntime.a	60	DRUNTIME = $(DRUNTIME_PATH)/lib$(MODEL)/libdruntime.a
55	else	61	else
		62	ifneq ($(MODEL),32)
		63	$(error "Anything except of Win32 isn't supported?")
		64	endif
56	DRUNTIME = $(DRUNTIME_PATH)/lib/druntime.lib	65	DRUNTIME = $(DRUNTIME_PATH)/lib/druntime.lib
57	endif	66	endif
58		67
Lines 76-82 Link Here
76		85
77	# Set CFLAGS	86	# Set CFLAGS
78	ifeq ($(OS),posix)	87	ifeq ($(OS),posix)
79	CFLAGS += -m32	88	CFLAGS += -m$(MODEL)
80	ifeq ($(BUILD),debug)	89	ifeq ($(BUILD),debug)
81	CFLAGS += -g	90	CFLAGS += -g
82	else	91	else

Return to bug 355527

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