Mercurial > hg > truffle

diff make/windows/makefiles/product.make @ 1983:c760f78e0a53

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7003125: precompiled.hpp is included when precompiled headers are not used Summary: Added an ifndef DONT_USE_PRECOMPILED_HEADER to precompiled.hpp. Set up DONT_USE_PRECOMPILED_HEADER when compiling with Sun Studio or when the user specifies USE_PRECOMPILED_HEADER=0. Fixed broken include dependencies. Reviewed-by: coleenp, kvn
author stefank
date Wed, 01 Dec 2010 15:04:06 +0100
parents f95d63e2154a
children cb2d0a362639
line wrap: on
line diff
--- a/make/windows/makefiles/product.make	Thu Dec 02 14:00:03 2010 -0500
+++ b/make/windows/makefiles/product.make	Wed Dec 01 15:04:06 2010 +0100
@@ -27,7 +27,12 @@
 AOUT=$(HS_FNAME)
 GENERATED=../generated
 
-default:: _build_pch_file.obj $(AOUT) checkAndBuildSA
+# Allow the user to turn off precompiled headers from the command line.
+!if "$(USE_PRECOMPILED_HEADER)" != "0"
+BUILD_PCH_FILE=_build_pch_file.obj
+!endif
+
+default:: $(BUILD_PCH_FILE) $(AOUT) checkAndBuildSA
 
 !include ../local.make
 !include compile.make