--- a/toolchain/toolchain-wrapper.c
+++ b/toolchain/toolchain-wrapper.c
@@ -447,6 +447,19 @@ int main(int argc, char **argv)
                    !strcmp(argv[i], "-D__UBOOT__"))
                        break;
        }
+
+       /* Catch the case where headers are being generated
+        * and the link time RELRO flags shouldn't be set.
+        *
+        * https://bugzilla.redhat.com/show_bug.cgi?id=718719
+        * https://lists.fedoraproject.org/pipermail/devel/2011-July/153864.html
+        * https://github.com/domoticz/domoticz/commit/68698e7a5dce80dea5a9b997d7e171b80bf566ac
+        */
+       for (i = 1; i < argc; i++) {
+               if (!strcmp(argv[i], "-xc-header") ||
+                   !strcmp(argv[i], "-xc++-header"))
+                       break;
+       }
        if (i == argc) {
                /* https://wiki.gentoo.org/wiki/Hardened/Toolchain#Mark_Read-Only_Appropriate_Sections */
 #ifdef BR2_RELRO_PARTIAL