Mercurial > hg > truffle
comparison make/linux/makefiles/launcher.make @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 12 Nov 2012 23:14:12 +0100 |
parents | 33df1aeaebbf b9a9ed0f8eeb |
children |
comparison
equal
deleted
inserted
replaced
6711:ae13cc658b80 | 6948:e522a00b91aa |
---|---|
1 # | 1 # |
2 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. | 2 # Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. |
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 # | 4 # |
5 # This code is free software; you can redistribute it and/or modify it | 5 # This code is free software; you can redistribute it and/or modify it |
6 # under the terms of the GNU General Public License version 2 only, as | 6 # under the terms of the GNU General Public License version 2 only, as |
7 # published by the Free Software Foundation. | 7 # published by the Free Software Foundation. |
80 $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CXXFLAGS) | 80 $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CXXFLAGS) |
81 | 81 |
82 $(LAUNCHER): $(OBJS) $(LIBJVM) $(LAUNCHER_MAPFILE) | 82 $(LAUNCHER): $(OBJS) $(LIBJVM) $(LAUNCHER_MAPFILE) |
83 $(QUIETLY) echo Linking launcher... | 83 $(QUIETLY) echo Linking launcher... |
84 $(QUIETLY) $(LINK_LAUNCHER/PRE_HOOK) | 84 $(QUIETLY) $(LINK_LAUNCHER/PRE_HOOK) |
85 $(QUIETLY) $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(OBJS) $(LIBS_LAUNCHER) | 85 $(QUIETLY) $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(sort $(OBJS)) $(LIBS_LAUNCHER) |
86 $(QUIETLY) $(LINK_LAUNCHER/POST_HOOK) | 86 $(QUIETLY) $(LINK_LAUNCHER/POST_HOOK) |
87 | 87 |
88 $(LAUNCHER): $(LAUNCHER_SCRIPT) | 88 $(LAUNCHER): $(LAUNCHER_SCRIPT) |
89 | 89 |
90 $(LAUNCHER_SCRIPT): $(LAUNCHERDIR)/launcher.script | 90 $(LAUNCHER_SCRIPT): $(LAUNCHERDIR)/launcher.script |