summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2010-10-07 01:56:18 -0400
committerJohn Wiegley <johnw@newartisans.com>2010-10-07 01:56:18 -0400
commit6901c3bd55d0ffa60ea9175c87223a3b11501a5b (patch)
tree95c6e1d0d08744f07ecbd9f3d36c055091ee5586 /lib
parent5fd91d26ceeae3fa944410c00708ad8ec33a8381 (diff)
downloadfork-ledger-6901c3bd55d0ffa60ea9175c87223a3b11501a5b.tar.gz
fork-ledger-6901c3bd55d0ffa60ea9175c87223a3b11501a5b.tar.bz2
fork-ledger-6901c3bd55d0ffa60ea9175c87223a3b11501a5b.zip
Added acprep support for building with Clang
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile32
1 files changed, 23 insertions, 9 deletions
diff --git a/lib/Makefile b/lib/Makefile
index a267e642..f2a8cd14 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -6,26 +6,40 @@ STOW_ROOT = /usr/local/stow
PRODUCTS = $(HOME)/Products
CC = gcc-mp-4.5
+ifeq ($(CC),clang)
+CXX = clang++
+LD = llvm-ld
+DIR_SUFFIX = clang
+else
CXX = g++-mp-4.5
LD = gcc-mp-4.5
-CXX_VERSION = 45
-CPPFLAGS = -D_GLIBCXX_DEBUG=1 -D_GLIBCXX_FULLY_DYNAMIC_STRING=1
+DIR_SUFFIX = gcc45
+endif
+CPPFLAGS = -D_GLIBCXX_FULLY_DYNAMIC_STRING=1
+ifneq ($(CC),clang)
+CPPFLAGS += -D_GLIBCXX_DEBUG=1
+endif
CFLAGS = $(CPPFLAGS) -g
LDFLAGS = -g
BOOST_VERSION = 1_44_0
BOOST_SOURCE = boost_$(BOOST_VERSION)
+BOOST_DEFINES = define=_GLIBCXX_FULLY_DYNAMIC_STRING=1
+ifeq ($(CC),clang)
+BOOST_TOOLSET = clang
+else
BOOST_TOOLSET = darwin
-BOOST_DEFINES = define=_GLIBCXX_DEBUG=1 define=_GLIBCXX_FULLY_DYNAMIC_STRING=1
+BOOST_DEFINES = define=_GLIBCXX_DEBUG=1
+endif
#BOOST_FLAGS = --architecture=x86 --address_model=32_64
BOOST_FLAGS = --toolset=$(BOOST_TOOLSET) \
--build-type=complete --layout=versioned \
$(BOOST_DEFINES)
-BOOST_DIR = boost_$(BOOST_VERSION)-gcc$(CXX_VERSION)
+BOOST_DIR = boost_$(BOOST_VERSION)-$(DIR_SUFFIX)
BOOST_STOW = $(STOW_ROOT)/$(BOOST_DIR)
BOOST_BUILD = $(PRODUCTS)/$(BOOST_DIR)
ICU_FLAGS = -sHAVE_ICU=1 -sICU_PATH=$(STOW_ROOT)/icu
-BOOST_ICU_DIR = boost_$(BOOST_VERSION)-icu-gcc$(CXX_VERSION)
+BOOST_ICU_DIR = boost_$(BOOST_VERSION)-icu-$(DIR_SUFFIX)
BOOST_ICU_STOW = $(STOW_ROOT)/$(BOOST_ICU_DIR)
BOOST_ICU_BUILD = $(PRODUCTS)/$(BOOST_ICU_DIR)
@@ -43,7 +57,7 @@ cppunit-build:
CFLAGS="$(CFLAGS)" \
LDFLAGS="$(LDFLAGS)" \
CC="$(CC)" CXX="$(CXX)" LD="$(LD)" \
- --prefix=$(STOW_ROOT)/cppunit-gcc$(CXX_VERSION) \
+ --prefix=$(STOW_ROOT)/cppunit-$(DIR_SUFFIX) \
--disable-doxygen --disable-dot && \
make install)
@@ -55,7 +69,7 @@ cppunit-build:
# LDFLAGS="$(LDFLAGS)" \
# CC="$(CC)" CXX="$(CXX)" LD="$(LD)" \
# --enable-static --enable-debug \
-# --prefix=$(STOW_ROOT)/icu-gcc$(CXX_VERSION) && \
+# --prefix=$(STOW_ROOT)/icu-$(DIR_SUFFIX) && \
# make install)
#
#boost-icu-build:
@@ -66,8 +80,8 @@ cppunit-build:
clean:
-rm -fr $(BOOST_STOW) $(BOOST_BUILD)
-rm -fr $(BOOST_ICU_STOW) $(BOOST_ICU_BUILD)
- -rm -fr $(STOW_ROOT)/cppunit-gcc$(CXX_VERSION)
- -rm -fr $(STOW_ROOT)/icu-gcc$(CXX_VERSION)
+ -rm -fr $(STOW_ROOT)/cppunit-$(DIR_SUFFIX)
+ -rm -fr $(STOW_ROOT)/icu-$(DIR_SUFFIX)
-(cd cppunit; make distclean)
-(cd icu/source; make distclean)