Set so restrict & use-after-free aren't GCC errors

2 files changed, 25 insertions, 0 deletions

diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index 76bb71953c..e616d30998 100644
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -273,6 +273,16 @@ target_link_libraries(llui
         ll::SDL2
     )
 
+if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
+    set_source_files_properties(
+        llcheckboxctrl.cpp
+        llresmgr.cpp
+        PROPERTIES COMPILE_FLAGS -Wno-restrict)
+    set_source_files_properties(
+        llflatlistview.cpp
+        PROPERTIES COMPILE_FLAGS -Wno-use-after-free)
+endif (CMAKE_CXX_COMPILER_ID MATCHES GNU)
+
 include(LibraryInstall)
 
 # Add tests
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 4c047d5d20..966e003b6c 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2031,6 +2031,21 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
         gltf/animation.cpp
         gltf/primitive.cpp
         PROPERTIES COMPILE_FLAGS -Wno-unused-function)
+    set_source_files_properties(
+        llaisapi.cpp
+        llconversationmodel.cpp
+        llconversationlog.cpp
+        lleventnotifier.cpp
+        llfloateravatarrendersettings.cpp
+        llfloatereditextdaycycle.cpp
+        llfloaternewfeaturenotification.cpp
+        llfloaterpathfindinglinksets.cpp
+        llinventoryfunctions.cpp
+        llinventorymodel.cpp
+        llpanelenvironment.cpp
+        llpanelgroupnotices.cpp
+        llvoavatar.cpp
+        PROPERTIES COMPILE_FLAGS -Wno-restrict)
 endif ()
 
 message("Copying fonts")