Mercurial > hg > truffle
diff make/windows/makefiles/vm.make @ 11144:33c52908bcdb
8015759: hotspot changes needed to compile with Visual Studio 2012
Reviewed-by: anthony, dholmes, dcubed
Contributed-by: Tim Bell <timothy.bell@oracle.com>
author | dholmes |
---|---|
date | Mon, 15 Jul 2013 23:23:15 -0400 |
parents | f2110083203d |
children | 6b0fd0964b87 31f3b1e1c5e5 |
line wrap: on
line diff
--- a/make/windows/makefiles/vm.make Mon Jul 15 12:06:50 2013 +0200 +++ b/make/windows/makefiles/vm.make Mon Jul 15 23:23:15 2013 -0400 @@ -132,6 +132,10 @@ !if "$(USE_PRECOMPILED_HEADER)" != "0" CXX_USE_PCH=/Fp"vm.pch" /Yu"precompiled.hpp" +!if "$(COMPILER_NAME)" == "VS2012" +# VS2012 requires this object file to be listed: +LD_FLAGS=$(LD_FLAGS) _build_pch_file.obj +!endif !else CXX_USE_PCH=$(CXX_DONT_USE_PCH) !endif