diff --git a/uppsrc/ide/Builders/GccBuilder.cpp b/uppsrc/ide/Builders/GccBuilder.cpp
index 3729e9128..c1078969b 100644
--- a/uppsrc/ide/Builders/GccBuilder.cpp
+++ b/uppsrc/ide/Builders/GccBuilder.cpp
@@ -130,14 +130,15 @@ bool GccBuilder::BuildPackage(const String& package, Vector<String>& linkfile, V
 
 	String cc = CmdLine(package, pkg);
 
-	if(IsVerbose())
-		cc << " -v";
+//	if(IsVerbose())
+//		cc << " -v";
 	if(HasFlag("WIN32")/* && HasFlag("MT")*/)
 		cc << " -mthreads";
-	if(HasFlag("DEBUG_MINIMAL"))
-		cc << (HasFlag("WIN32") ? " -g1" : " -ggdb -g1");
-	if(HasFlag("DEBUG_FULL"))
-		cc << (HasFlag("WIN32") ? " -g2" : " -ggdb -g2");
+
+	if(HasFlag("DEBUG_MINIMAL") || HasFlag("DEBUG_FULL")) {
+		cc << (HasFlag("WIN32") && HasFlag("CLANG") ? " -gcodeview -fno-limit-debug-info" : " -ggdb");
+		cc << (HasFlag("DEBUG_FULL") ? " -g2" : " -g1");
+	}
 	String fuse_cxa_atexit;
 	if(is_shared /*&& !HasFlag("MAIN")*/) {
 		cc << " -shared -fPIC";
@@ -481,8 +482,8 @@ bool GccBuilder::Link(const Vector<String>& linkfile, const String& linkoptions,
 		if(GetFileTime(linkfile[i]) > targettime) {
 			Vector<String> lib;
 			String lnk = CompilerName();
-			if(IsVerbose())
-				lnk << " -v";
+//			if(IsVerbose())
+//				lnk << " -v";
 			if(HasFlag("GCC32"))
 				lnk << " -m32";
 			if(HasFlag("DLL"))
@@ -510,7 +511,7 @@ bool GccBuilder::Link(const Vector<String>& linkfile, const String& linkoptions,
 			if(createmap)
 				lnk << " -Wl,-Map," << GetHostPathQ(GetFileDirectory(target) + GetFileTitle(target) + ".map");
 			if(HasFlag("DEBUG_MINIMAL") || HasFlag("DEBUG_FULL"))
-				lnk << " -ggdb";
+				lnk << (HasFlag("CLANG") && HasFlag("WIN32") ? " -Wl,-pdb=" : " -ggdb");
 			else
 				lnk << (!HasFlag("OSX") ? " -Wl,-s" : "");
 			for(i = 0; i < libpath.GetCount(); i++)
diff --git a/uppsrc/ide/Debug.cpp b/uppsrc/ide/Debug.cpp
index 278c4a8e4..c149bb0bb 100644
--- a/uppsrc/ide/Debug.cpp
+++ b/uppsrc/ide/Debug.cpp
@@ -311,7 +311,7 @@ void Ide::BuildAndDebug(bool runto)
 	bool console = ShouldHaveConsole();
 
 #ifdef PLATFORM_WIN32
-	if(findarg(builder, "GCC", "CLANG") < 0 || bm.Get("DEBUG_OPTIONS", String()).Find("-gcodeview") >= 0) // llvm-mingw can generate pdb symbolic info
+	if(findarg(builder, "GCC") < 0) // llvm-mingw can generate pdb symbolic info
 		debugger = PdbCreate(pick(host), target, runarg, builder == "CLANG");
 	else
 #endif
diff --git a/uppsrc/ide/InstantSetup.cpp b/uppsrc/ide/InstantSetup.cpp
index 9753c08a2..0c4625a1b 100644
--- a/uppsrc/ide/InstantSetup.cpp
+++ b/uppsrc/ide/InstantSetup.cpp
@@ -155,9 +155,9 @@ void InstantSetup()
 			bmSet(bm, "DEBUG_INFO", "2");
 			bmSet(bm, "DEBUG_BLITZ", "1");
 			bmSet(bm, "DEBUG_LINKMODE", "0");
-			bmSet(bm, "DEBUG_OPTIONS", "-O0 -g -gcodeview -fno-limit-debug-info");
+			bmSet(bm, "DEBUG_OPTIONS", "");
 			bmSet(bm, "DEBUG_FLAGS", "");
-			bmSet(bm, "DEBUG_LINK", "-Wl,-pdb= -Wl,--stack,20000000");
+			bmSet(bm, "DEBUG_LINK", "-Wl,--stack,20000000");
 			bmSet(bm, "RELEASE_BLITZ", "");
 			bmSet(bm, "RELEASE_LINKMODE", "0");
 			bmSet(bm, "RELEASE_OPTIONS", "-O3 ");