Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Using clang 11 to compile on linux and MacOS #472

Merged
merged 2 commits into from
Jun 5, 2021
Merged

Using clang 11 to compile on linux and MacOS #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19ebc84
Using clang 11 to compile on linux and MacOS
ShengguangXiao Jun 2, 2021
89db8a9
Revert change to make apple darwin build pass
ShengguangXiao Jun 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions contrib/dockerfiles/x86_64-pc-linux-gnu.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,14 @@ RUN apt-get install -y apt-transport-https
RUN apt install -y software-properties-common build-essential libtool autotools-dev automake \
pkg-config bsdmainutils python3 libssl-dev libevent-dev libboost-system-dev \
libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev \
libminiupnpc-dev libzmq3-dev libqrencode-dev \
libminiupnpc-dev libzmq3-dev libqrencode-dev wget \
curl cmake

# install clang 11
RUN wget https://apt.llvm.org/llvm.sh
RUN chmod +x llvm.sh
RUN ./llvm.sh 11

# For Berkeley DB - but we don't need as we do a depends build.
# RUN apt install -y libdb-dev

Expand Down Expand Up @@ -47,7 +52,7 @@ COPY . .
RUN ./autogen.sh

# XREF: #make-configure
RUN ./configure --prefix=`pwd`/depends/${TARGET}
RUN ./configure CC=clang-11 CXX=clang++-11 --prefix=`pwd`/depends/${TARGET}

ARG BUILD_VERSION=

Expand Down
7 changes: 5 additions & 2 deletions make.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ build() {
popd >/dev/null
./autogen.sh
# XREF: #make-configure
./configure --prefix="$(pwd)/depends/${target}" ${extra_build_opts}
./configure CC=clang-11 CXX=clang++-11 --prefix="$(pwd)/depends/${target}" ${extra_build_opts}
make $extra_make_args
}

Expand Down Expand Up @@ -324,8 +324,11 @@ pkg_install_deps() {
sudo apt install -y software-properties-common build-essential libtool autotools-dev automake \
pkg-config bsdmainutils python3 libssl-dev libevent-dev libboost-system-dev \
libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev \
libminiupnpc-dev libzmq3-dev libqrencode-dev \
libminiupnpc-dev libzmq3-dev libqrencode-dev wget \
curl cmake
wget https://apt.llvm.org/llvm.sh
chmod +x llvm.sh
sudo ./llvm.sh 11
}

pkg_ensure_mac_sdk() {
Expand Down