diff options
| author |  bunnei | 2018-01-15 00:22:06 -0500 |
|---|---|---|
| committer |  GitHub | 2018-01-15 00:22:06 -0500 |
| commit | 2678dbfbe6f2097a66237a3dfbdf09c3c400d7ad (patch) | |
| tree | aac0f592deaaadec8dad5b46a6db0319d2292352 | |
| parent | Merge pull request #14 from ogniK5377/master (diff) | |
| parent | fixed build for gcc c++17 / boost.icl incompatibility (diff) | |
| download | yuzu-2678dbfbe6f2097a66237a3dfbdf09c3c400d7ad.tar.gz yuzu-2678dbfbe6f2097a66237a3dfbdf09c3c400d7ad.tar.xz yuzu-2678dbfbe6f2097a66237a3dfbdf09c3c400d7ad.zip | |
Merge pull request #13 from hpr/fno-new-ttp-matching
Fix build for gcc c++17 / boost.icl incompatibility
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 09fe9bcd3..2af11a4e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -134,6 +134,12 @@ else() | |||
| 134 | set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /MANIFEST:NO /INCREMENTAL:NO /OPT:REF,ICF" CACHE STRING "" FORCE) | 134 | set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /MANIFEST:NO /INCREMENTAL:NO /OPT:REF,ICF" CACHE STRING "" FORCE) |
| 135 | endif() | 135 | endif() |
| 136 | 136 | ||
| 137 | # Fix GCC C++17 and Boost.ICL incompatibility (needed to build dynarmic) | ||
| 138 | # See https://bugzilla.redhat.com/show_bug.cgi?id=1485641#c1 | ||
| 139 | if (CMAKE_COMPILER_IS_GNUCC) | ||
| 140 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-new-ttp-matching") | ||
| 141 | endif() | ||
| 142 | |||
| 137 | # Set file offset size to 64 bits. | 143 | # Set file offset size to 64 bits. |
| 138 | # | 144 | # |
| 139 | # On modern Unixes, this is typically already the case. The lone exception is | 145 | # On modern Unixes, this is typically already the case. The lone exception is |