Mercurial > hg > graal-jvmci-8
comparison make/windows/makefiles/product.make @ 10408:836a62f43af9
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Wed, 19 Jun 2013 10:45:56 +0200 |
parents | aabf54ccedb1 |
children | c062a6e1fa33 |
comparison
equal
deleted
inserted
replaced
10086:e0fb8a213650 | 10408:836a62f43af9 |
---|---|
30 # Allow the user to turn off precompiled headers from the command line. | 30 # Allow the user to turn off precompiled headers from the command line. |
31 !if "$(USE_PRECOMPILED_HEADER)" != "0" | 31 !if "$(USE_PRECOMPILED_HEADER)" != "0" |
32 BUILD_PCH_FILE=_build_pch_file.obj | 32 BUILD_PCH_FILE=_build_pch_file.obj |
33 !endif | 33 !endif |
34 | 34 |
35 default:: $(BUILD_PCH_FILE) $(AOUT) launcher checkAndBuildSA | 35 default:: $(BUILD_PCH_FILE) $(AOUT) checkAndBuildSA |
36 | 36 |
37 !include ../local.make | 37 !include ../local.make |
38 !include compile.make | 38 !include compile.make |
39 | 39 |
40 CXX_FLAGS=$(CXX_FLAGS) $(PRODUCT_OPT_OPTION) | 40 CXX_FLAGS=$(CXX_FLAGS) $(PRODUCT_OPT_OPTION) |
71 !endif | 71 !endif |
72 !endif | 72 !endif |
73 | 73 |
74 !include $(WorkSpace)/make/windows/makefiles/shared.make | 74 !include $(WorkSpace)/make/windows/makefiles/shared.make |
75 !include $(WorkSpace)/make/windows/makefiles/sa.make | 75 !include $(WorkSpace)/make/windows/makefiles/sa.make |
76 !include $(WorkSpace)/make/windows/makefiles/launcher.make |