Mercurial > hg > truffle

comparison make/bsd/makefiles/vm.make @ 7482:989155e2d07a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with hs25-b15.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Wed, 16 Jan 2013 01:34:24 +0100
parents 5d0bb7d52783 892acf0431ef
children 5fc51c1ecdeb
comparison
equal deleted inserted replaced
7381:6761a8f854a4 7482:989155e2d07a
136 # JVM 136 # JVM
137 137
138 JVM = jvm 138 JVM = jvm
139 ifeq ($(OS_VENDOR), Darwin) 139 ifeq ($(OS_VENDOR), Darwin)
140 LIBJVM = lib$(JVM).dylib 140 LIBJVM = lib$(JVM).dylib
141 LIBJVM_G = lib$(JVM)$(G_SUFFIX).dylib
142 CFLAGS += -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE 141 CFLAGS += -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE
143 else 142 else
144 LIBJVM = lib$(JVM).so 143 LIBJVM = lib$(JVM).so
145 LIBJVM_G = lib$(JVM)$(G_SUFFIX).so
146 endif 144 endif
147 145
148 SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt graal 146 SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt graal
149 147
150 SOURCE_PATHS=\ 148 SOURCE_PATHS=\
323 $(LINK_LIB.CXX/PRE_HOOK) \ 321 $(LINK_LIB.CXX/PRE_HOOK) \
324 $(LINK_VM) $(LD_SCRIPT_FLAG) \ 322 $(LINK_VM) $(LD_SCRIPT_FLAG) \
325 $(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM); \ 323 $(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM); \
326 $(LINK_LIB.CXX/POST_HOOK) \ 324 $(LINK_LIB.CXX/POST_HOOK) \
327 rm -f $@.1; ln -s $@ $@.1; \ 325 rm -f $@.1; ln -s $@ $@.1; \
328 [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \
329 } 326 }
330 327
331 DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM) 328 DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM)
332 329
333 install_jvm: $(LIBJVM) 330 install_jvm: $(LIBJVM)