aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorme0wmix <me0wmix@sigaint.org>2016-01-22 20:27:01 -0700
committerme0wmix <me0wmix@sigaint.org>2016-01-22 20:27:01 -0700
commit34ebfe39cde8f476417b0a69634eff4be073179a (patch)
tree537a5a5309fab64c973903d99600e1366988f51f
parentMore formatting fixes to instructions (diff)
downloadmonero-34ebfe39cde8f476417b0a69634eff4be073179a.tar.xz
Last fixups in the Cmake stuff and better default build instruction
-rw-r--r--CMakeLists.txt9
-rw-r--r--README.md4
2 files changed, 2 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 809ab35ff..c032bbee0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -382,19 +382,12 @@ else()
set(RELEASE_FLAGS "${RELEASE_FLAGS} -ffat-lto-objects")
endif()
# Since gcc 4.9 the LTO format is non-standard (slim), so we need the gcc-specific ar and ranlib binaries
- if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9.0))
+ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9.0) AND NOT OPENBSD)
set(CMAKE_AR "gcc-ar")
set(CMAKE_RANLIB "gcc-ranlib")
endif()
endif()
- if(OPENBSD)
- # This works around some bugs in the gcc 4.9 package as well as forces Boost to use the multithreaded libs
- set(CMAKE_AR "ar")
- set(CMAKE_RANLIB "ranlib")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
- endif()
-
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${DEBUG_FLAGS}")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${DEBUG_FLAGS}")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${RELEASE_FLAGS}")
diff --git a/README.md b/README.md
index cbee82c67..4fc756f08 100644
--- a/README.md
+++ b/README.md
@@ -173,9 +173,7 @@ https://github.com/bitcoin/bitcoin/blob/master/doc/build-openbsd.md
You will have to add the serialize, datetime, and regex modules to Boost when building as they are needed by Monero.
-To build: "env CC=egcc CXX=eg++ CPP=ecpp DEVELOPER_LOCAL_TOOLS=1 BOOST_ROOT=/path/to/the/boost/you/built make"
-
-You may optionally build it statically by using the correct target.
+To build: "env CC=egcc CXX=eg++ CPP=ecpp DEVELOPER_LOCAL_TOOLS=1 BOOST_ROOT=/path/to/the/boost/you/built make release-static-64"
## Building Documentation