Skip to content

Commit daec1a2

Browse files
committed
Update build config.
1 parent 540d922 commit daec1a2

File tree

3 files changed

+205
-117
lines changed

3 files changed

+205
-117
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ install:
6161
- if [[ $LINUX && $GCC && $STATIC ]]; then sudo apt-get -qq install bash-completion; fi
6262

6363
# Download and install packages for osx/clang/dynamic.
64-
- if [[ $OSX && $CLANG && $DYNAMIC ]]; then brew install bash-completion; fi
64+
- if [[ $OSX && $CLANG && $DYNAMIC ]]; then brew unlink bash-completion; brew install bash-completion; fi
6565

6666
# Download and install packages for linux/clang/dynamic.
6767
- if [[ $LINUX && $CLANG && $DYNAMIC ]]; then sudo apt-get -qq install boost1.54; fi
@@ -74,7 +74,7 @@ script:
7474
# Download and build libbitcoin-server and all dependencies.
7575
- if [[ $OSX && $CLANG && $STATIC ]]; then ./install.sh --without-consensus --with-secp256k1 --without-openssl --enable-testnet --disable-shared --build-boost --prefix=$HOME/my-prefix; fi
7676
- if [[ $LINUX && $CLANG && $STATIC ]]; then ./install.sh --with-secp256k1 --without-openssl --disable-shared --build-boost --prefix=$HOME/my-prefix CXXFLAGS='-Os -stdlib=libstdc++' LDLIBS='-lstdc++'; fi
77-
- if [[ $LINUX && $GCC && $STATIC ]]; then ./install.sh --disable-ndebug --disable-shared --build-boost --prefix=$HOME/my-prefix --build-dir=my-build --with-bash-completiondir CXXFLAGS='-Os -s'; fi
77+
- if [[ $LINUX && $GCC && $STATIC ]]; then ./install.sh --disable-ndebug --disable-shared --build-boost --prefix=$HOME/my-prefix --build-dir=my-build --with-bash-completiondir CXXFLAGS='-Os -s -static'; fi
7878
- if [[ $OSX && $CLANG && $DYNAMIC ]]; then ./install.sh --with-secp256k1 --without-openssl --with-bash-completiondir; fi
7979
- if [[ $LINUX && $CLANG && $DYNAMIC ]]; then sudo CXX=$CXX CC=$CC ./install.sh --disable-ndebug --disable-static CXXFLAGS='-Os -stdlib=libstdc++' LDLIBS='-lstdc++'; fi
8080
- if [[ $LINUX && $GCC && $DYNAMIC ]]; then sudo CXX=$CXX CC=$CC ./install.sh --without-consensus --disable-static --build-boost --with-bash-completiondir CXXFLAGS='-Os -s'; fi

configure.ac

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,12 +209,6 @@ AS_CASE([${CC}], [*clang*],
209209
[AX_CHECK_COMPILE_FLAG([-Wno-deprecated-register],
210210
[CXXFLAGS="$CXXFLAGS -Wno-deprecated-register"])])
211211

212-
# Clean up boost 1.49 headers. Enabled in gcc only.
213-
#------------------------------------------------------------------------------
214-
AS_CASE([${CC}], [*gcc*],
215-
[AX_CHECK_COMPILE_FLAG([-Wno-unused-local-typedefs],
216-
[CXXFLAGS="$CXXFLAGS -Wno-unused-local-typedefs"])])
217-
218212
# Protect stack.
219213
#------------------------------------------------------------------------------
220214
AS_CASE([${CC}], [*],

0 commit comments

Comments
 (0)