diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2013-02-15 14:10:01 -0500 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2013-02-15 19:55:44 -0500 |
| commit | fbd860287e6474bd7a61013796541bf2ea72d5cd (patch) | |
| tree | 2cb4bd14ab1c17d81adb335d55902815befa5890 /bitcoin-qt.pro | |
| parent | 2f0fa79db290d5139c27409055b2035099afa6fd (diff) | |
| download | bitcoin-fbd860287e6474bd7a61013796541bf2ea72d5cd.tar.xz | |
Pass compiler flags down into leveldb make
Fixes issue#2288. Includes cleanups from Luke's pull 2243.
Diffstat (limited to 'bitcoin-qt.pro')
| -rw-r--r-- | bitcoin-qt.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index 7bab4a4975..169d227794 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -99,14 +99,14 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) { INCLUDEPATH += src/leveldb/include src/leveldb/helpers LIBS += $$PWD/src/leveldb/libleveldb.a $$PWD/src/leveldb/libmemenv.a !win32 { - genleveldb.commands = cd $$PWD/src/leveldb && $(MAKE) libleveldb.a libmemenv.a + genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS\" libleveldb.a libmemenv.a } else { # make an educated guess about what the ranlib command is called isEmpty(QMAKE_RANLIB) { QMAKE_RANLIB = $$replace(QMAKE_STRIP, strip, ranlib) } LIBS += -lshlwapi - genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a + genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS\" libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a } genleveldb.target = $$PWD/src/leveldb/libleveldb.a genleveldb.depends = FORCE |