[Scummvm-git-logs] scummvm master -> 42c8212713d5a0b5a60cf5319667c647f7376b8c

[bonki]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
42c8212713 CONFIGURE: Disable -Wpragma-pack for >=clang-6.0


Commit: 42c8212713d5a0b5a60cf5319667c647f7376b8c
    https://github.com/scummvm/scummvm/commit/42c8212713d5a0b5a60cf5319667c647f7376b8c
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-07-06T09:54:39+02:00

Commit Message:
CONFIGURE: Disable -Wpragma-pack for >=clang-6.0

Clang 6 enables -Wpragma-pack which warns when leaving an included file
which changes the current alignment.
Our common/pack-{start,end}.h trigger this and it cannot easily and portably
be disabled inside pack-{start,end}.h so we disable it globally for now.

Changed paths:
    configure


diff --git a/configure b/configure
index 9d1265f..26b8958 100755
--- a/configure
+++ b/configure
@@ -1914,6 +1914,14 @@ fi
 
 if test "$have_clang" = yes; then
 	add_line_to_config_mk 'HAVE_CLANG = 1'
+	_clang_major=`gcc_get_define __clang_major__`
+	#_clang_minor=`gcc_get_define __clang_minor__`
+
+	# clang 6.0 enables -Wpragma-pack which warns when leaving an included file
+	# which changes the current alignment.
+	# Our common/pack-{start,end}.h trigger this and it cannot easily and portably
+	# be disabled inside pack-{start,end}.h so we disable it globally for now.
+	test "$_clang_major" -ge 6 && append_var CXXFLAGS "-Wno-pragma-pack"
 
 	# clang does accept all gcc options we use, so we keep have_gcc
 fi