From b998228f1396c9341a154e785abf684d465c93e4 Mon Sep 17 00:00:00 2001 From: CryptoManiac Date: Sun, 13 Mar 2016 18:49:33 +0300 Subject: [PATCH] Use current CC and CXX environment variables for leveldb compilation. --- novacoin-qt.pro | 4 ++-- src/makefile.bsd | 5 ++++- src/makefile.osx | 3 ++- src/makefile.unix | 5 ++++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/novacoin-qt.pro b/novacoin-qt.pro index 8643309..e005090 100644 --- a/novacoin-qt.pro +++ b/novacoin-qt.pro @@ -9,8 +9,8 @@ CONFIG += no_include_pwd CONFIG += thread CONFIG += static -#QMAKE_CC=clang -#QMAKE_CXX=clang++ +# QMAKE_CC=clang +# QMAKE_CXX=clang++ freebsd-g++: QMAKE_TARGET.arch = $$QMAKE_HOST.arch linux-g++: QMAKE_TARGET.arch = $$QMAKE_HOST.arch diff --git a/src/makefile.bsd b/src/makefile.bsd index 7afc86d..b31e457 100644 --- a/src/makefile.bsd +++ b/src/makefile.bsd @@ -6,6 +6,9 @@ USE_LEVELDB:=0 USE_IPV6:=1 ARCH:=$(uname -m) +# CC:=clang +# CXX:=clang++ + LINK:=$(CXX) DEFS=-DBOOST_SPIRIT_THREADSAFE -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS @@ -147,7 +150,7 @@ DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) -DUSE_LEVELDB DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers) OBJS += obj/txdb-leveldb.o leveldb/libleveldb.a: - @echo "Building LevelDB ..."; cd leveldb; gmake libleveldb.a libmemenv.a; cd ..; + @echo "Building LevelDB ..."; cd leveldb; CC=$(CC) CXX=$(CXX) gmake libleveldb.a libmemenv.a; cd ..; obj/txdb-leveldb.o: leveldb/libleveldb.a endif ifneq (${USE_LEVELDB}, 1) diff --git a/src/makefile.osx b/src/makefile.osx index a057b9e..0fc1052 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -6,6 +6,7 @@ # Mac OS X makefile for bitcoin # Originally by Laszlo Hanyecz (solar@heliacal.net) +CC=llvm-gcc CXX=llvm-g++ DEPSDIR=/opt/local @@ -115,7 +116,7 @@ DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) -DUSE_LEVELDB DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers) OBJS += obj/txdb-leveldb.o leveldb/libleveldb.a: - @echo "Building LevelDB ..."; cd leveldb; make; cd .. + @echo "Building LevelDB ..."; cd leveldb; CC=$(CC) CXX=$(CXX) make; cd .. obj/txdb-leveldb.o: leveldb/libleveldb.a else OBJS += obj/txdb-bdb.o diff --git a/src/makefile.unix b/src/makefile.unix index 2dddfa6..f4da324 100644 --- a/src/makefile.unix +++ b/src/makefile.unix @@ -5,6 +5,9 @@ USE_LEVELDB:=0 USE_IPV6:=1 +# CC=clang +# CXX=clang++ + LINK:=$(CXX) ARCH:=$(shell uname -m) @@ -148,7 +151,7 @@ DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) -DUSE_LEVELDB DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers) OBJS += obj/txdb-leveldb.o leveldb/libleveldb.a: - @echo "Building LevelDB ..."; cd leveldb; make libleveldb.a libmemenv.a; cd ..; + @echo "Building LevelDB ..."; cd leveldb; CC=$(CC) CXX=$(CXX) make libleveldb.a libmemenv.a; cd ..; obj/txdb-leveldb.o: leveldb/libleveldb.a endif ifneq (${USE_LEVELDB}, 1) -- 1.7.1