diff --git a/QGCCommon.pri b/QGCCommon.pri
index 98bbffc74b2ef7a4d84d09d8dd357c65b6aa8962..c5dc4cb96aeab691d42fd731312f0ba0fdfac728 100644
--- a/QGCCommon.pri
+++ b/QGCCommon.pri
@@ -200,7 +200,9 @@ MacBuild | LinuxBuild {
         # Latest clang version has a buggy check for this which cause Qt headers to throw warnings on qmap.h
         QMAKE_CXXFLAGS_WARN_ON += -Wno-return-stack-address
         # Xcode 8.3 has issues on how MAVLink accesses (packed) message structure members.
-        QMAKE_CXXFLAGS_WARN_ON += -Wno-address-of-packed-member
+        # Note that this will fail when Xcode version reaches 10.x.x
+        XCODE_VERSION = $$system($$PWD/tools/get_xcode_version.sh)
+        greaterThan(XCODE_VERSION, 8.2.0): QMAKE_CXXFLAGS_WARN_ON += -Wno-address-of-packed-member
     }
 }
 
diff --git a/tools/get_xcode_version.sh b/tools/get_xcode_version.sh
new file mode 100755
index 0000000000000000000000000000000000000000..1ba8bf13206b9ee9a216d222849389f684672712
--- /dev/null
+++ b/tools/get_xcode_version.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+xcodebuild -version 2>&1 | (head -n1) | awk  '{print $2}'
+