Skip to content

Commit

Permalink
Merge pull request #97 from jmdavis/broken_linux
Browse files Browse the repository at this point in the history
Switching the order of some stuff seems to fix the linux build.
  • Loading branch information
andralex committed Jun 12, 2011
2 parents 55493bc + a3953a2 commit 0586a19
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions posix.mak
Expand Up @@ -166,26 +166,26 @@ STD_MODULES = $(addprefix std/, algorithm array base64 bigint bitmanip \

STD_NET_MODULES = $(addprefix std/net/, isemail)

# Other D modules that aren't under std/
EXTRA_DOCUMENTABLES := $(addprefix etc/c/,curl zlib) $(addprefix \
std/c/, fenv locale math process stdarg stddef stdio stdlib string \
time wcharh)
EXTRA_MODULES := $(EXTRA_DOCUMENTABLES) $(addprefix \
std/internal/math/, biguintcore biguintnoasm biguintx86 \
gammafunction errorfunction)

# OS-specific D modules
EXTRA_MODULES_LINUX := $(addprefix std/c/linux/, linux socket)
EXTRA_MODULES_OSX := $(addprefix std/c/osx/, socket)
EXTRA_MODULES_FREEBSD := $(addprefix std/c/freebsd/, socket)
EXTRA_MODULES_WIN32 := $(addprefix std/c/windows/, com stat windows \
winsock) $(addprefix std/windows/, charset iunknown syserror)
ifeq (,$(findstring win,$(OS)))
EXTRA_DOCUMENTABLES+=$(EXTRA_MODULES_LINUX)
EXTRA_DOCUMENTABLES:=$(EXTRA_MODULES_LINUX)
else
EXTRA_DOCUMENTABLES+=$(EXTRA_MODULES_WIN32)
EXTRA_DOCUMENTABLES:=$(EXTRA_MODULES_WIN32)
endif

# Other D modules that aren't under std/
EXTRA_DOCUMENTABLES += $(addprefix etc/c/,curl zlib) $(addprefix \
std/c/, fenv locale math process stdarg stddef stdio stdlib string \
time wcharh)
EXTRA_MODULES += $(EXTRA_DOCUMENTABLES) $(addprefix \
std/internal/math/, biguintcore biguintnoasm biguintx86 \
gammafunction errorfunction)

# Aggregate all D modules relevant to this build
D_MODULES = crc32 $(STD_MODULES) $(EXTRA_MODULES) $(STD_NET_MODULES)
# Add the .d suffix to the module names
Expand Down

0 comments on commit 0586a19

Please sign in to comment.