commit 69deca60e70d2992ee3f49c1a981b8432864abc0
author James Rumble <jerumble@gmail.com> Thu Jul 01 11:39:34 2021 +0100
committer swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com <swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Jul 02 20:42:41 2021 +0000
tree a98c508955a4276fe1f66af11558216541b80d83
parent 314508f788b26560503ef4bcc8693c6b01fc8abf

Fix gcc < 9 builds

Bug: b/192284721
Change-Id: I9b90cc5f77f7481c0bdcddb417679cf129ecc4c8
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/55348
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Presubmit-Ready: Nicolas Capens <nicolascapens@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Commit-Queue: Nicolas Capens <nicolascapens@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3c478d..4811b7b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -424,10 +424,15 @@
         "-Wreorder"
         "-Wsign-compare"
         "-Wmissing-braces"
-        "-Wdeprecated-copy"  # implicit copy constructor for 'X' is deprecated because of user-declared copy assignment operator.
     )
 
-    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+        if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 9)
+            list(APPEND SWIFTSHADER_COMPILE_OPTIONS
+                "-Wdeprecated-copy"  # implicit copy constructor for 'X' is deprecated because of user-declared copy assignment operator.
+            )  
+        endif()
+    elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         list(APPEND SWIFTSHADER_COMPILE_OPTIONS
             "-Wextra"
             "-Wunreachable-code-loop-increment"
@@ -435,6 +440,7 @@
             "-Wstring-conversion"
             "-Wextra-semi"
             "-Wignored-qualifiers"
+            "-Wdeprecated-copy"  # implicit copy constructor for 'X' is deprecated because of user-declared copy assignment operator.
         )
     endif()