aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2016-03-21 17:53:33 +0100
committerSverker Eriksson <[email protected]>2016-03-21 17:53:33 +0100
commitfa9b620d82ad6370800008ab436f17f75b99bfe3 (patch)
treeb2e112888e4ed48f44521d46efa826bb6f1ef4e8 /lib
parent4642ca894bb553901bf03562f84fe5ad1485c8ad (diff)
parent63e92d169851ff90d72181afd98c4d0adcbc7245 (diff)
downloadotp-fa9b620d82ad6370800008ab436f17f75b99bfe3.tar.gz
otp-fa9b620d82ad6370800008ab436f17f75b99bfe3.tar.bz2
otp-fa9b620d82ad6370800008ab436f17f75b99bfe3.zip
Merge branch 'sverk/win-test-debug-compile'
Diffstat (limited to 'lib')
-rw-r--r--lib/common_test/test_server/ts_autoconf_win32.erl10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/common_test/test_server/ts_autoconf_win32.erl b/lib/common_test/test_server/ts_autoconf_win32.erl
index 288305b406..26ab30f987 100644
--- a/lib/common_test/test_server/ts_autoconf_win32.erl
+++ b/lib/common_test/test_server/ts_autoconf_win32.erl
@@ -139,15 +139,15 @@ visual_cxx(Vars) ->
{"-MTd ",
"-MDd ",
"-LDd ",
- "-debug -pdb:none ",
+ "-link -debug -pdb:none ",
"-Z7 -DDEBUG",
" "};
false ->
{"-MT ",
"-MD ",
"-LD ",
- " ",
- " ",
+ "-Zi -link ",
+ "-Zi ",
"-Ox "}
end,
WIN32 = "-D__WIN32__ ",
@@ -158,7 +158,7 @@ visual_cxx(Vars) ->
{'LD', CC},
{'SHLIB_LD', CC},
{'SHLIB_LDFLAGS', ERTS_THR_LIB ++ DLL},
- {'SHLIB_LDLIBS', "-link " ++ DBG_LINK ++ "kernel32.lib"},
+ {'SHLIB_LDLIBS', DBG_LINK ++ "kernel32.lib"},
{'SHLIB_EXTRACT_ALL', ""},
{'CFLAGS', DEFAULT_THR_LIB ++ WIN32 ++ DBG_COMP},
{'EI_CFLAGS', DEFAULT_THR_LIB ++ WIN32 ++ DBG_COMP},
@@ -168,7 +168,7 @@ visual_cxx(Vars) ->
{'DEFS', common_c_defs()},
{'SHLIB_SUFFIX', ".dll"},
{'ERTS_LIBS', ERTS_THR_LIB ++ LIBS},
- {'LIBS', DEFAULT_THR_LIB ++ "-link " ++ DBG_LINK ++ LIBS},
+ {'LIBS', DEFAULT_THR_LIB ++ DBG_LINK ++ LIBS},
{obj,".obj"},
{exe, ".exe"},
{test_c_compiler, "{msc, undefined}"}