1 --- dmd2/src/phobos/posix.mak.orig 2014-02-24 05:23:10.000000000 +0100
2 +++ dmd2/src/phobos/posix.mak 2014-03-21 19:46:59.187698023 +0100
4 PATHSEP:=$(shell echo "\\")
7 -LINKDL:=$(if $(findstring $(OS),linux),-L-ldl,)
8 +LINKDL:=$(if $(findstring $(OS),linux),-L-ldl -L-lz,)
10 # Set VERSION, where the file is that contains the version string
11 VERSION=../dmd/VERSION
13 # Aggregate all C files over all OSs (this is for the zip file)
14 ALL_C_FILES = $(C_FILES) $(C_EXTRAS)
16 -OBJS = $(addsuffix $(DOTOBJ),$(addprefix $(ROOT)/,$(C_MODULES)))
18 MAKEFILE = $(firstword $(MAKEFILE_LIST))
20 SUBMAKE = $(MAKE) --no-print-directory OS=$(OS) -f $(MAKEFILE)
22 @[ -d $(dir $@) ] || mkdir -p $(dir $@) || [ -d $(dir $@) ]
23 $(CC) -c $(CFLAGS) $< -o$@
25 -$(LIB) : $(OBJS) $(ALL_D_FILES) druntime_libs
26 - $(DMD) $(DFLAGS) -lib -of$@ $(DRUNTIME) $(D_FILES) $(OBJS)
27 +$(LIB) : $(ALL_D_FILES) druntime_libs
28 + $(DMD) $(DFLAGS) -lib -of$@ $(DRUNTIME) $(D_FILES)
30 dll : $(ROOT)/libphobos2.so
32 --- dmd2/tools/posix.mak.orig 2014-02-13 16:09:46.000000000 +0100
33 +++ dmd2/tools/posix.mak 2014-03-22 10:01:55.092212006 +0100
35 #dreadful custom step because of libcurl dmd linking problem (Bugzilla 7044)
36 $(CURL_TOOLS): $(ROOT)/%: %.d
37 $(DMD) -c -of$(@).o $(<)
38 - ($(DMD) -v -of$(@) $(@).o 2>/dev/null | grep '\-Xlinker' | cut -f2- -d' ' ; echo -lcurl ) | xargs $(CC)
39 + ($(DMD) -v -of$(@) $(@).o 2>/dev/null | grep '\-Xlinker' | cut -f2- -d' ' ; echo -lcurl -lz) | xargs $(CC)
41 $(TOOLS) $(DOC_TOOLS): $(ROOT)/%: %.d
42 $(DMD) $(MODEL_FLAG) $(DFLAGS) -of$(@) $(<)