Merge branch 'master' of https://github.com/LeonardoTemperanza/Odin

1 files changed, 15 insertions, 1 deletions

diff --git a/src/build_settings.cpp b/src/build_settings.cpp
index abf8e6809..7a0952583 100644
--- a/src/build_settings.cpp
+++ b/src/build_settings.cpp
@@ -548,7 +548,7 @@ struct BuildContext {
 	bool   ignore_microsoft_magic;
 	bool   linker_map_file;
 
-	bool   para_poly_diagnostics;
+	bool   build_diagnostics;
 
 	bool   use_single_module;
 	bool   use_separate_modules;
@@ -575,6 +575,8 @@ struct BuildContext {
 
 	bool   min_link_libs;
 
+	String export_linked_libs_path;
+
 	bool   print_linker_flags;
 
 	RelocMode reloc_mode;
@@ -2093,7 +2095,19 @@ gb_internal bool check_target_feature_is_enabled(String const &feature, String *
 	for (;;) {
 		String str = string_split_iterator(&it, ',');
 		if (str == "") break;
+
 		if (!string_set_exists(&build_context.target_features_set, str)) {
+			String plus_str = concatenate_strings(temporary_allocator(), make_string_c("+"), str);
+
+			if (!string_set_exists(&build_context.target_features_set, plus_str)) {
+				if (not_enabled) *not_enabled = str;
+				return false;
+			}
+		}
+
+		String minus_str = concatenate_strings(temporary_allocator(), make_string_c("-"), str);
+
+		if (string_set_exists(&build_context.target_features_set, minus_str)) {
 			if (not_enabled) *not_enabled = str;
 			return false;
 		}