projects / packages / dmd.git / blame
| Commit | Line | Data |
|---|---|---|
| bcce314d JB |
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 | |
| 3 | @@ -147,7 +147,7 @@ | |
| 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 | |
| 12 | @@ -236,8 +236,6 @@ | |
| 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))) | |
| 17 | - | |
| 18 | MAKEFILE = $(firstword $(MAKEFILE_LIST)) | |
| 19 | ||
| 20 | SUBMAKE = $(MAKE) --no-print-directory OS=$(OS) -f $(MAKEFILE) | |
| 21 | @@ -274,8 +272,8 @@ | |
| 22 | @[ -d $(dir $@) ] || mkdir -p $(dir $@) || [ -d $(dir $@) ] | |
| 23 | $(CC) -c $(CFLAGS) $< -o$@ | |
| 24 | ||
| 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) | |
| 29 | ||
| 30 | dll : $(ROOT)/libphobos2.so | |
| 31 |