mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-12-12 19:36:32 +02:00
Merge pull request #630
b4f01b9
linux32: use vendored libunbound (Jaquee)f653535
linux 32 build config test (Jaquee)
This commit is contained in:
commit
4ca35af11a
@ -154,7 +154,7 @@ elif [ "$platform" == "linux64" ]; then
|
||||
elif [ "$platform" == "linux32" ]; then
|
||||
echo "Configuring build for Linux i686"
|
||||
if [ "$STATIC" == true ]; then
|
||||
cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="i686" -D BUILD_64=OFF -D BUILD_GUI_DEPS=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../..
|
||||
cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D STATIC=ON -D ARCH="i686" -D BUILD_64=OFF -D BUILD_GUI_DEPS=ON -D INSTALL_VENDORED_LIBUNBOUND=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../..
|
||||
else
|
||||
cmake -D CMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -D BUILD_GUI_DEPS=ON -D CMAKE_INSTALL_PREFIX="$MONERO_DIR" ../..
|
||||
fi
|
||||
|
@ -217,9 +217,9 @@ linux {
|
||||
message("using static libraries")
|
||||
LIBS+= -Wl,-Bstatic
|
||||
QMAKE_LFLAGS += -static-libgcc -static-libstdc++
|
||||
contains(QT_ARCH, x86_64) {
|
||||
# contains(QT_ARCH, x86_64) {
|
||||
LIBS+= -lunbound
|
||||
}
|
||||
# }
|
||||
} else {
|
||||
# On some distro's we need to add dynload
|
||||
LIBS+= -ldl
|
||||
|
Loading…
Reference in New Issue
Block a user