summarylogtreecommitdiffstats
path: root/ignore-return-value-error.patch
diff options
context:
space:
mode:
authoracerix2017-04-23 14:45:31 -0400
committeracerix2017-04-23 14:45:31 -0400
commit6372123ab04c6a6f692a68f57eab5703bda148d1 (patch)
tree4778f4cbd1b5674bc10466a23bb76d74965a65e0 /ignore-return-value-error.patch
parentfd67edaba789145dcc23676ff92e1a46d56a9e63 (diff)
downloadaur-6372123ab04c6a6f692a68f57eab5703bda148d1.tar.gz
allow building with clang 4.0
Diffstat (limited to 'ignore-return-value-error.patch')
-rw-r--r--ignore-return-value-error.patch15
1 files changed, 12 insertions, 3 deletions
diff --git a/ignore-return-value-error.patch b/ignore-return-value-error.patch
index 5d2faf08dc8e..769a2ef44aa1 100644
--- a/ignore-return-value-error.patch
+++ b/ignore-return-value-error.patch
@@ -1,6 +1,15 @@
---- Engine/Source/Programs/UnrealBuildTool/Linux/LinuxToolChain.cs.old 2017-01-04 13:45:29.669145563 -0500
-+++ Engine/Source/Programs/UnrealBuildTool/Linux/LinuxToolChain.cs 2017-01-04 13:45:34.875764475 -0500
-@@ -393,6 +393,8 @@
+--- ./src/UnrealEngine/Engine/Source/Programs/UnrealBuildTool/Linux/LinuxToolChain.cs.orig 2017-04-23 13:59:57.476068918 -0400
++++ ./src/UnrealEngine/Engine/Source/Programs/UnrealBuildTool/Linux/LinuxToolChain.cs 2017-04-23 14:42:48.021739418 -0400
+@@ -94,7 +94,7 @@
+ throw new BuildException("clang 3.4.x is known to miscompile the engine - refusing to register the Linux toolchain.");
+ }
+ // prevent unknown clangs since the build is likely to fail on too old or too new compilers
+- else if ((CompilerVersionMajor * 10 + CompilerVersionMinor) > 39 || (CompilerVersionMajor * 10 + CompilerVersionMinor) < 35)
++ else if ((CompilerVersionMajor * 10 + CompilerVersionMinor) > 40 || (CompilerVersionMajor * 10 + CompilerVersionMinor) < 35)
+ {
+ throw new BuildException(
+ string.Format("This version of the Unreal Engine can only be compiled with clang 3.9, 3.8, 3.7, 3.6 and 3.5. clang {0} may not build it - please use a different version.",
+@@ -387,6 +387,8 @@
Result += " -Wno-unused-variable";
// this will hide the warnings about static functions in headers that aren't used in every single .cpp file
Result += " -Wno-unused-function";