1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
|
--- dmd2.054/src/dmd/posix.mak.orig 2011-07-10 22:19:30.000000000 +0200
+++ dmd2.054/src/dmd/posix.mak 2011-07-22 19:39:07.797180890 +0200
@@ -28,7 +28,7 @@ C=backend
TK=tk
ROOT=root
-MODEL=32
+MODEL?=32
ifeq (OSX,$(TARGET))
## See: http://developer.apple.com/documentation/developertools/conceptual/cross_development/Using/chapter_3_section_2.html#//apple_ref/doc/uid/20002000-1114311-BABGCAAB
--- dmd2/src/druntime/posix.mak.orig 2011-06-25 02:39:28.000000000 +0200
+++ dmd2/src/druntime/posix.mak 2011-07-22 17:42:40.570533111 +0200
@@ -20,21 +20,21 @@ ifeq (,$(OS))
endif
endif
-DMD=dmd
+DMD?=dmd
DOCDIR=doc
IMPDIR=import
-MODEL=32
+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
+OBJDIR=obj$(MODEL)
DRUNTIME_BASE=druntime
-DRUNTIME=lib/lib$(DRUNTIME_BASE).a
+DRUNTIME=lib$(MODEL)/lib$(DRUNTIME_BASE).a
DOCFMT=
--- dmd2/src/phobos/etc/c/zlib/gzio.c.orig 2011-07-26 23:58:57.240222466 +0200
+++ dmd2/src/phobos/etc/c/zlib/gzio.c 2011-07-26 23:59:20.136336207 +0200
@@ -8,6 +8,7 @@
/* @(#) $Id$ */
#include <stdio.h>
+#include <errno.h>
#include "zutil.h"
--- dmd2/src/phobos/posix.mak.orig 2011-07-10 22:19:30.000000000 +0200
+++ dmd2/src/phobos/posix.mak 2011-07-22 17:51:00.901014107 +0200
@@ -48,7 +48,7 @@ endif
DRUNTIME_PATH = ../druntime
ZIPFILE = phobos.zip
ROOT_OF_THEM_ALL = generated
-ROOT = $(ROOT_OF_THEM_ALL)/$(OS)/$(BUILD)/$(MODEL)
+ROOT = $(ROOT_OF_THEM_ALL)/$(OS)/$(BUILD)$(MODEL)
# Documentation-related stuff
DOCSRC = ../d-programming-language.org
WEBSITE_DIR = ../web
@@ -61,8 +61,6 @@ DDOCFLAGS=-m$(MODEL) -d -c -o- -version=
# Variable defined in an OS-dependent manner (see below)
CC =
-DMD =
-DDOC =
CFLAGS =
DFLAGS =
@@ -75,7 +73,7 @@ MAKEFILE:=$(lastword $(MAKEFILE_LIST))
# Set DRUNTIME name and full path
ifeq (,$(findstring win,$(OS)))
- DRUNTIME = $(DRUNTIME_PATH)/lib/libdruntime.a
+ DRUNTIME = $(DRUNTIME_PATH)/lib$(MODEL)/libdruntime.a
else
DRUNTIME = $(DRUNTIME_PATH)/lib/druntime.lib
endif
@@ -83,14 +81,14 @@ endif
# Set CC and DMD
ifeq ($(OS),win32wine)
CC = wine dmc.exe
- DMD = wine dmd.exe
+ DMD ?= wine dmd.exe
RUN = wine
else
ifeq ($(OS),win32remote)
- DMD = ssh 206.125.170.138 "cd code/dmd/phobos && dmd"
+ 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
+ DMD ?= dmd
ifeq ($(OS),win32)
CC = dmc
else
@@ -141,7 +139,7 @@ else
endif
# Set DDOC, the documentation generator
-DDOC=dmd
+DDOC?=$(DMD)
# Set LIB, the ultimate target
ifeq (,$(findstring win,$(OS)))
|
GitWeb