diff -Nru a/scripts/gcc-plugins/checker_plugin.c b/scripts/gcc-plugins/checker_plugin.c
--- a/scripts/gcc-plugins/checker_plugin.c	2019-01-08 17:19:45.113540981 -0500
+++ b/scripts/gcc-plugins/checker_plugin.c	2019-01-15 12:52:45.604592209 -0500
@@ -457,7 +457,7 @@
 //	PASS_INFO(context, "ssa", 1, PASS_POS_INSERT_AFTER);
 	PASS_INFO(context, "phiprop", 1, PASS_POS_INSERT_AFTER);
 
-	if (!plugin_default_version_check(version, &gcc_version)) {
+	if (!plugin_version_check_buildhack(version, &gcc_version)) {
 		error_gcc_version(version);
 		return 1;
 	}
diff -Nru a/scripts/gcc-plugins/colorize_plugin.c b/scripts/gcc-plugins/colorize_plugin.c
--- a/scripts/gcc-plugins/colorize_plugin.c	2019-01-08 17:19:45.113540981 -0500
+++ b/scripts/gcc-plugins/colorize_plugin.c	2019-01-15 12:52:45.605592245 -0500
@@ -121,7 +121,7 @@
 
 	PASS_INFO(colorize_rearm, "*free_lang_data", 1, PASS_POS_INSERT_AFTER);
 
-	if (!plugin_default_version_check(version, &gcc_version)) {
+	if (!plugin_version_check_buildhack(version, &gcc_version)) {
 		error_gcc_version(version);
 		return 1;
 	}
diff -Nru a/scripts/gcc-plugins/constify_plugin.c b/scripts/gcc-plugins/constify_plugin.c
--- a/scripts/gcc-plugins/constify_plugin.c	2019-01-08 17:19:45.114540987 -0500
+++ b/scripts/gcc-plugins/constify_plugin.c	2019-01-15 12:52:45.606592280 -0500
@@ -536,7 +536,7 @@
 
 	PASS_INFO(check_local_variables, "ssa", 1, PASS_POS_INSERT_BEFORE);
 
-	if (!plugin_default_version_check(version, &gcc_version)) {
+	if (!plugin_version_check_buildhack(version, &gcc_version)) {
 		error_gcc_version(version);
 		return 1;
 	}
diff -Nru a/scripts/gcc-plugins/cyc_complexity_plugin.c b/scripts/gcc-plugins/cyc_complexity_plugin.c
--- a/scripts/gcc-plugins/cyc_complexity_plugin.c	2019-01-08 17:19:45.114540987 -0500
+++ b/scripts/gcc-plugins/cyc_complexity_plugin.c	2019-01-15 12:52:45.607592316 -0500
@@ -55,7 +55,7 @@
 
 	PASS_INFO(cyc_complexity, "ssa", 1, PASS_POS_INSERT_AFTER);
 
-	if (!plugin_default_version_check(version, &gcc_version)) {
+	if (!plugin_version_check_buildhack(version, &gcc_version)) {
 		error_gcc_version(version);
 		return 1;
 	}
diff -Nru a/scripts/gcc-plugins/gcc-common.h b/scripts/gcc-plugins/gcc-common.h
--- a/scripts/gcc-plugins/gcc-common.h	2019-01-08 17:19:45.114540987 -0500
+++ b/scripts/gcc-plugins/gcc-common.h	2019-01-15 12:52:45.613592529 -0500
@@ -193,6 +193,26 @@
 	return cstr;
 }
 
+static inline bool plugin_version_check_buildhack(struct plugin_gcc_version *gcc_version, 
+		struct plugin_gcc_version *plugin_version) 
+{
+
+	if (!gcc_version || !plugin_version)
+		return false;
+
+	if (strcmp (gcc_version->basever, plugin_version->basever))
+		return false;
+	if (strcmp (gcc_version->datestamp, plugin_version->datestamp))
+		return false;
+	if (strcmp (gcc_version->devphase, plugin_version->devphase))
+		return false;
+	if (strcmp (gcc_version->revision, plugin_version->revision))
+		return false;
+	// if (strcmp (gcc_version->configuration_arguments, plugin_version->configuration_arguments))
+	//	return false;
+	return true;
+}
+
 static inline void error_gcc_version(struct plugin_gcc_version *version)
 {
 	error(G_("incompatible gcc/plugin versions: need %s %s %s %s but have %s %s %s %s"),
diff -Nru a/scripts/gcc-plugins/initify_plugin.c b/scripts/gcc-plugins/initify_plugin.c
--- a/scripts/gcc-plugins/initify_plugin.c	2019-01-08 17:19:45.115540993 -0500
+++ b/scripts/gcc-plugins/initify_plugin.c	2019-01-15 12:52:45.614592565 -0500
@@ -1819,7 +1819,7 @@
 
 	PASS_INFO(initify, "inline", 1, PASS_POS_INSERT_AFTER);
 
-	if (!plugin_default_version_check(version, &gcc_version)) {
+	if (!plugin_version_check_buildhack(version, &gcc_version)) {
 		error_gcc_version(version);
 		return 1;
 	}
diff -Nru a/scripts/gcc-plugins/kallocstat_plugin.c b/scripts/gcc-plugins/kallocstat_plugin.c
--- a/scripts/gcc-plugins/kallocstat_plugin.c	2019-01-08 17:19:45.115540993 -0500
+++ b/scripts/gcc-plugins/kallocstat_plugin.c	2019-01-15 12:52:45.614592565 -0500
@@ -119,7 +119,7 @@
 
 	PASS_INFO(kallocstat, "ssa", 1, PASS_POS_INSERT_AFTER);
 
-	if (!plugin_default_version_check(version, &gcc_version)) {
+	if (!plugin_version_check_buildhack(version, &gcc_version)) {
 		error_gcc_version(version);
 		return 1;
 	}
diff -Nru a/scripts/gcc-plugins/kernexec_plugin.c b/scripts/gcc-plugins/kernexec_plugin.c
--- a/scripts/gcc-plugins/kernexec_plugin.c	2019-01-08 17:19:45.115540993 -0500
+++ b/scripts/gcc-plugins/kernexec_plugin.c	2019-01-15 12:52:45.615592601 -0500
@@ -360,7 +360,7 @@
 	PASS_INFO(kernexec_fptr, "pre", 1, PASS_POS_INSERT_AFTER);
 	PASS_INFO(kernexec_retaddr, "pro_and_epilogue", 1, PASS_POS_INSERT_AFTER);
 
-	if (!plugin_default_version_check(version, &gcc_version)) {
+	if (!plugin_version_check_buildhack(version, &gcc_version)) {
 		error_gcc_version(version);
 		return 1;
 	}
diff -Nru a/scripts/gcc-plugins/latent_entropy_plugin.c b/scripts/gcc-plugins/latent_entropy_plugin.c
--- a/scripts/gcc-plugins/latent_entropy_plugin.c	2019-01-08 17:19:45.116540999 -0500
+++ b/scripts/gcc-plugins/latent_entropy_plugin.c	2019-01-15 12:52:45.615592601 -0500
@@ -577,7 +577,7 @@
 
 	PASS_INFO(latent_entropy, "optimized", 1, PASS_POS_INSERT_BEFORE);
 
-	if (!plugin_default_version_check(version, &gcc_version)) {
+	if (!plugin_version_check_buildhack(version, &gcc_version)) {
 		error_gcc_version(version);
 		return 1;
 	}
diff -Nru a/scripts/gcc-plugins/randomize_layout_plugin.c b/scripts/gcc-plugins/randomize_layout_plugin.c
--- a/scripts/gcc-plugins/randomize_layout_plugin.c	2019-01-08 17:19:45.116540999 -0500
+++ b/scripts/gcc-plugins/randomize_layout_plugin.c	2019-01-15 12:52:45.616592636 -0500
@@ -859,7 +859,7 @@
 	find_bad_casts_pass_info.ref_pass_instance_number	= 1;
 	find_bad_casts_pass_info.pos_op			= PASS_POS_INSERT_AFTER;
 
-	if (!plugin_default_version_check(version, &gcc_version)) {
+	if (!plugin_version_check_buildhack(version, &gcc_version)) {
 		error(G_("incompatible gcc/plugin versions"));
 		return 1;
 	}
Binary files a/scripts/gcc-plugins/rap_plugin/rap_plugin.so and b/scripts/gcc-plugins/rap_plugin/rap_plugin.so differ
diff -Nru a/scripts/gcc-plugins/sancov_plugin.c b/scripts/gcc-plugins/sancov_plugin.c
--- a/scripts/gcc-plugins/sancov_plugin.c	2019-01-08 17:19:45.117541005 -0500
+++ b/scripts/gcc-plugins/sancov_plugin.c	2019-01-15 12:52:45.617592672 -0500
@@ -114,7 +114,7 @@
 	PASS_INFO(sancov, "nrv", 1, PASS_POS_INSERT_BEFORE);
 #endif
 
-	if (!plugin_default_version_check(version, &gcc_version)) {
+	if (!plugin_version_check_buildhack(version, &gcc_version)) {
 		error_gcc_version(version);
 		return 1;
 	}
diff -Nru a/scripts/gcc-plugins/size_overflow_plugin/size_overflow_plugin.c b/scripts/gcc-plugins/size_overflow_plugin/size_overflow_plugin.c
--- a/scripts/gcc-plugins/size_overflow_plugin/size_overflow_plugin.c	2019-01-08 17:19:45.185541401 -0500
+++ b/scripts/gcc-plugins/size_overflow_plugin/size_overflow_plugin.c	2019-01-15 12:52:45.617592672 -0500
@@ -232,7 +232,7 @@
 	PASS_INFO(disable_ubsan_si_overflow, "ubsan", 1, PASS_POS_REPLACE);
 #endif
 
-	if (!plugin_default_version_check(version, &gcc_version)) {
+	if (!plugin_version_check_buildhack(version, &gcc_version)) {
 		error_gcc_version(version);
 		return 1;
 	}
diff -Nru a/scripts/gcc-plugins/stackleak_plugin.c b/scripts/gcc-plugins/stackleak_plugin.c
--- a/scripts/gcc-plugins/stackleak_plugin.c	2019-01-08 17:19:45.186541407 -0500
+++ b/scripts/gcc-plugins/stackleak_plugin.c	2019-01-15 12:52:45.618592708 -0500
@@ -313,7 +313,7 @@
 	PASS_INFO(stackleak_tree_instrument, "optimized", 1, PASS_POS_INSERT_BEFORE);
 	PASS_INFO(stackleak_final, "final", 1, PASS_POS_INSERT_BEFORE);
 
-	if (!plugin_default_version_check(version, &gcc_version)) {
+	if (!plugin_version_check_buildhack(version, &gcc_version)) {
 		error_gcc_version(version);
 		return 1;
 	}
diff -Nru a/scripts/gcc-plugins/structleak_plugin.c b/scripts/gcc-plugins/structleak_plugin.c
--- a/scripts/gcc-plugins/structleak_plugin.c	2019-01-08 17:19:45.186541407 -0500
+++ b/scripts/gcc-plugins/structleak_plugin.c	2019-01-15 12:52:45.620592779 -0500
@@ -201,7 +201,7 @@
 
 	PASS_INFO(structleak, "early_optimizations", 1, PASS_POS_INSERT_BEFORE);
 
-	if (!plugin_default_version_check(version, &gcc_version)) {
+	if (!plugin_version_check_buildhack(version, &gcc_version)) {
 		error_gcc_version(version);
 		return 1;
 	}