Просмотр исходного кода

fixed build for gcc c++17 / boost.icl incompatibility

Harry Prevor 8 лет назад
Родитель
Сommit
f2d55bb881
1 измененных файлов с 6 добавлено и 0 удалено
  1. 6 0
      CMakeLists.txt

+ 6 - 0
CMakeLists.txt

@@ -134,6 +134,12 @@ else()
     set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /MANIFEST:NO /INCREMENTAL:NO /OPT:REF,ICF" CACHE STRING "" FORCE)
     set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/DEBUG /MANIFEST:NO /INCREMENTAL:NO /OPT:REF,ICF" CACHE STRING "" FORCE)
 endif()
 endif()
 
 
+# Fix GCC C++17 and Boost.ICL incompatibility (needed to build dynarmic)
+# See https://bugzilla.redhat.com/show_bug.cgi?id=1485641#c1
+if (CMAKE_COMPILER_IS_GNUCC)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-new-ttp-matching")
+endif()
+
 # Set file offset size to 64 bits.
 # Set file offset size to 64 bits.
 #
 #
 # On modern Unixes, this is typically already the case. The lone exception is
 # On modern Unixes, this is typically already the case. The lone exception is