]>
Commit | Line | Data |
---|---|---|
bf555f48 JB |
1 | --- dmd2/src/phobos/posix.mak.orig 2015-04-25 05:20:30.000000000 +0200 |
2 | +++ dmd2/src/phobos/posix.mak 2015-07-22 15:28:25.126243307 +0200 | |
3 | @@ -160,7 +160,7 @@ | |
bcce314d JB |
4 | PATHSEP:=$(shell echo "\\") |
5 | endif | |
6 | ||
7 | -LINKDL:=$(if $(findstring $(OS),linux),-L-ldl,) | |
8 | +LINKDL:=$(if $(findstring $(OS),linux),-L-ldl -L-lz,) | |
9 | ||
10 | # Set VERSION, where the file is that contains the version string | |
11 | VERSION=../dmd/VERSION | |
bf555f48 | 12 | @@ -262,7 +262,7 @@ |
bcce314d JB |
13 | # Aggregate all C files over all OSs (this is for the zip file) |
14 | ALL_C_FILES = $(C_FILES) $(C_EXTRAS) | |
15 | ||
16 | -OBJS = $(addsuffix $(DOTOBJ),$(addprefix $(ROOT)/,$(C_MODULES))) | |
bf555f48 | 17 | +OBJS = |
bcce314d | 18 | |
bf555f48 | 19 | MAKEFILE = $(firstword $(MAKEFILE_LIST)) |
bcce314d | 20 | |
bf555f48 JB |
21 | --- dmd2/tools/posix.mak.orig 2015-07-21 22:13:45.308848546 +0200 |
22 | +++ dmd2/tools/posix.mak 2015-07-22 15:29:39.346240185 +0200 | |
23 | @@ -103,7 +103,7 @@ | |
24 | $(DMD) $(MODEL_FLAG) $(DFLAGS) -c -of$(@).o $(<) | |
25 | # grep for the linker invocation and append -lcurl | |
26 | LINKCMD=$$($(DMD) $(MODEL_FLAG) $(DFLAGS) -v -of$(@) $(@).o 2>/dev/null | grep $(@).o); \ | |
27 | - $${LINKCMD} -lcurl | |
28 | + $${LINKCMD} -lcurl -lz | |
fbcc5afc JB |
29 | |
30 | $(TOOLS) $(DOC_TOOLS): $(ROOT)/%: %.d | |
31 | $(DMD) $(MODEL_FLAG) $(DFLAGS) -of$(@) $(<) |