Mercurial > hg > truffle

comparison make/windows/makefiles/product.make @ 4970:33df1aeaebbf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 27 Feb 2012 13:10:13 +0100
parents 719f7007c8e8
children 2d503de963b3 d652a62d6e03
comparison
equal deleted inserted replaced
4703:2cfb7fb2dce7 4970:33df1aeaebbf
35 default:: $(BUILD_PCH_FILE) $(AOUT) launcher checkAndBuildSA 35 default:: $(BUILD_PCH_FILE) $(AOUT) launcher checkAndBuildSA
36 36
37 !include ../local.make 37 !include ../local.make
38 !include compile.make 38 !include compile.make
39 39
40 CPP_FLAGS=$(CPP_FLAGS) $(PRODUCT_OPT_OPTION) 40 CXX_FLAGS=$(CXX_FLAGS) $(PRODUCT_OPT_OPTION)
41 41
42 RELEASE= 42 RELEASE=
43 43
44 RC_FLAGS=$(RC_FLAGS) /D "NDEBUG" 44 RC_FLAGS=$(RC_FLAGS) /D "NDEBUG"
45 45
52 $(Res_Files): FORCE 52 $(Res_Files): FORCE
53 53
54 # Kernel doesn't need exported vtbl symbols. 54 # Kernel doesn't need exported vtbl symbols.
55 !if "$(Variant)" == "kernel" 55 !if "$(Variant)" == "kernel"
56 $(AOUT): $(Res_Files) $(Obj_Files) 56 $(AOUT): $(Res_Files) $(Obj_Files)
57 $(LINK) @<< 57 $(LD) @<<
58 $(LINK_FLAGS) /out:$@ /implib:$*.lib $(Obj_Files) $(Res_Files) 58 $(LD_FLAGS) /out:$@ /implib:$*.lib $(Obj_Files) $(Res_Files)
59 << 59 <<
60 !else 60 !else
61 vm.def: $(Obj_Files) 61 vm.def: $(Obj_Files)
62 sh $(WorkSpace)/make/windows/build_vm_def.sh 62 sh $(WorkSpace)/make/windows/build_vm_def.sh
63 63
64 $(AOUT): $(Res_Files) $(Obj_Files) vm.def 64 $(AOUT): $(Res_Files) $(Obj_Files) vm.def
65 $(LINK) @<< 65 $(LD) @<<
66 $(LINK_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files) 66 $(LD_FLAGS) /out:$@ /implib:$*.lib /def:vm.def $(Obj_Files) $(Res_Files)
67 << 67 <<
68 !endif 68 !endif
69 !if "$(MT)" != "" 69 !if "$(MT)" != ""
70 # The previous link command created a .manifest file that we want to 70 # The previous link command created a .manifest file that we want to
71 # insert into the linked artifact so we do not need to track it 71 # insert into the linked artifact so we do not need to track it