diff --git a/uppbox/Scripts/domake b/uppbox/Scripts/domake
index 592d107fe..715ba6df3 100755
--- a/uppbox/Scripts/domake
+++ b/uppbox/Scripts/domake
@@ -345,7 +345,7 @@ log_debug_info "Configuring uppsrc/Makefile, uppsrc/uMakefile, GCC.bm and CLANG.
 if which pkg-config
 then
 
-  if [[ "$Macro" == *"-DflagNOGTK"* ]]
+  if [[ "$Macro" = *"-DflagNOGTK"* ]]
   then
     requires_libraries="x11 libnotify freetype2"
   else
@@ -387,7 +387,7 @@ then
 
 fi
 
-if [[ "$Macro" == *"-DflagNOGTK"* ]]
+if [[ "$Macro" = *"-DflagNOGTK"* ]]
 then
   log_debug_info "Removing references to GTK+"
   sed -i.backup \
diff --git a/uppsrc/ide/Core/Host.cpp b/uppsrc/ide/Core/Host.cpp
index ff581b850..9f32035f2 100644
--- a/uppsrc/ide/Core/Host.cpp
+++ b/uppsrc/ide/Core/Host.cpp
@@ -315,6 +315,12 @@ void LocalHost::Launch(const char *_cmdline, bool console)
 
 void LocalHost::AddFlags(Index<String>& cfg)
 {
+	// Allow to specify custom platform flags
+	for (const String& config : cfg)
+		if(findarg(config, "WIN32", "LINUX", "POSIX", "BSD", "FREEBSD", \
+			"OPENBSD", "NETBSD", "DRAGONFLY", "SOLARIS", "OSX11") >= 0)
+			return;
+
 #if   defined(PLATFORM_WIN32)
 	cfg.Add("WIN32");
 #endif
@@ -597,4 +603,4 @@ void RemoteHost::AddFlags(Index<String>& cfg)
 {
 	cfg.Add(os_type);
 }
-#endif
\ No newline at end of file
+#endif