summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPixel <pixel@nobis-crew.org>2011-10-18 09:35:45 -0700
committerPixel <pixel@nobis-crew.org>2011-10-18 09:35:45 -0700
commite0add8d5cb4fdb408efda292f64e029aa7ebbad2 (patch)
treef256b90f2cf03dba7f00ecac07500ad85064d8d4 /Makefile
parent56837535aeb1c7ae0fa2730d77dd718c334cf729 (diff)
Fixing Darwin compilation:
-) Using clang instead of gcc for the native target (*sigh*) -) Fixing libeio (*sigh*) -) "Fixing" the connect() call in Sockets because Darwin is stupid (*SIIIIIIIGH*) Although the Threads unit test isn't working properly.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 498f331..051d84c 100644
--- a/Makefile
+++ b/Makefile
@@ -27,12 +27,14 @@ INCLUDES = includes libcoro libeio libev
LIBS =
ifeq ($(SYSTEM),Darwin)
+ CC = clang
+ CXX = clang++
CPPFLAGS += -fPIC
LDFLAGS += -fPIC
LIBS += pthread iconv
CONFIG_H = darwin-config.h
ARCH_FLAGS = -arch i386
- LD = g++ -arch i386
+ LD = clang++ -arch i386
STRIP = strip -x
ifeq ($(TRUESYSTEM),Linux)
CROSSCOMPILE = true
@@ -190,10 +192,10 @@ libBalau.a: $(BALAU_OBJECTS)
dep: $(ALL_DEPS)
%.dep : %.cc
- $(CXX) $(CXXFLAGS) $(CPPFLAGS_NO_ARCH) -M -MF $@ $<
+ $(CXX) $(CXXFLAGS) $(CPPFLAGS_NO_ARCH) -M $< > $@
%.dep : %.c
- $(CC) $(CFLAGS) $(CPPFLAGS_NO_ARCH) -M -MF $@ $<
+ $(CC) $(CFLAGS) $(CPPFLAGS_NO_ARCH) -M $< > $@
-include $(ALL_DEPS)