Mercurial > hg > truffle
diff make/windows/makefiles/vm.make @ 11173:6b0fd0964b87
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Wed, 31 Jul 2013 11:00:54 +0200 |
| parents | 836a62f43af9 33c52908bcdb |
| children | 3cce976666d9 |
line wrap: on
line diff
--- a/make/windows/makefiles/vm.make Tue Jul 30 13:03:28 2013 -0700 +++ b/make/windows/makefiles/vm.make Wed Jul 31 11:00:54 2013 +0200 @@ -136,6 +136,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