summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.lib2
-rw-r--r--readme.txt2
2 files changed, 3 insertions, 1 deletions
diff --git a/config.lib b/config.lib
index 523b6104c..2c7e0ff78 100644
--- a/config.lib
+++ b/config.lib
@@ -1304,6 +1304,8 @@ make_compiler_cflags() {
# warning: narrowing conversion of '...' from 'unsigned int' to 'int' inside { } [-Wnarrowing]
# They are valid according to the C++ standard, but useless.
cxxflags="$cxxflags -Wno-narrowing"
+ # Disable bogus 'attempt to free a non-heap object' warning
+ flags="$flags -Wno-free-nonheap-object"
fi
if [ "$enable_lto" != "0" ]; then
diff --git a/readme.txt b/readme.txt
index a7a8f32ac..16a047f50 100644
--- a/readme.txt
+++ b/readme.txt
@@ -470,7 +470,7 @@ The following compilers are known to compile OpenTTD:
Version 2005 gives bogus warnings about scoping issues.
- GNU Compiler Collection (GCC) 3.3 - 4.7.
Versions 4.1 and earlier give bogus warnings about uninitialised variables.
- Versions 4.4 and later give bogus warnings about freeing non-heap objects.
+ Versions 4.4 - 4.6 give bogus warnings about freeing non-heap objects.
Versions 4.5 and later give invalid warnings when lto is enabled.
- Intel C++ Compiler (ICC) 12.0.