Mercurial > hg > truffle
comparison make/linux/makefiles/top.make @ 4137:04b9a2566eec
Merge with hsx23/hotspot.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Sat, 17 Dec 2011 21:40:27 +0100 |
parents | 0654ee04b214 f4414323345f |
children | 33df1aeaebbf |
comparison
equal
deleted
inserted
replaced
3737:9dc19b7d89a3 | 4137:04b9a2566eec |
---|---|
45 GENERATED = $(TOPDIR)/../generated | 45 GENERATED = $(TOPDIR)/../generated |
46 VM = $(GAMMADIR)/src/share/vm | 46 VM = $(GAMMADIR)/src/share/vm |
47 Plat_File = $(Platform_file) | 47 Plat_File = $(Platform_file) |
48 CDG = cd $(GENERATED); | 48 CDG = cd $(GENERATED); |
49 | 49 |
50 ifdef USE_PRECOMPILED_HEADER | 50 ifneq ($(USE_PRECOMPILED_HEADER),0) |
51 PrecompiledOption = -DUSE_PRECOMPILED_HEADER | 51 UpdatePCH = $(MAKE) -f vm.make $(PRECOMPILED_HEADER) $(MFLAGS) |
52 UpdatePCH = $(MAKE) -f vm.make $(PRECOMPILED_HEADER) $(MFLAGS) | |
53 else | 52 else |
54 UpdatePCH = \# precompiled header is not used | 53 UpdatePCH = \# precompiled header is not used |
55 PrecompiledOption = | |
56 endif | 54 endif |
57 | 55 |
58 Cached_plat = $(GENERATED)/platform.current | 56 Cached_plat = $(GENERATED)/platform.current |
59 | 57 |
60 AD_Dir = $(GENERATED)/adfiles | 58 AD_Dir = $(GENERATED)/adfiles |