Mercurial > hg > truffle
comparison make/bsd/makefiles/vm.make @ 7414:594b9b2119ed
Merge
author | minqi |
---|---|
date | Wed, 19 Dec 2012 16:10:19 -0800 |
parents | 892acf0431ef |
children | 989155e2d07a e7e9e08147fc |
comparison
equal
deleted
inserted
replaced
7407:1f323009c3ea | 7414:594b9b2119ed |
---|---|
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 | 146 SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt |
149 | 147 |
150 SOURCE_PATHS=\ | 148 SOURCE_PATHS=\ |
312 $(LINK_LIB.CXX/PRE_HOOK) \ | 310 $(LINK_LIB.CXX/PRE_HOOK) \ |
313 $(LINK_VM) $(LD_SCRIPT_FLAG) \ | 311 $(LINK_VM) $(LD_SCRIPT_FLAG) \ |
314 $(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM); \ | 312 $(LFLAGS_VM) -o $@ $(sort $(LIBJVM.o)) $(LIBS_VM); \ |
315 $(LINK_LIB.CXX/POST_HOOK) \ | 313 $(LINK_LIB.CXX/POST_HOOK) \ |
316 rm -f $@.1; ln -s $@ $@.1; \ | 314 rm -f $@.1; ln -s $@ $@.1; \ |
317 [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \ | |
318 } | 315 } |
319 | 316 |
320 DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM) | 317 DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM) |
321 | 318 |
322 install_jvm: $(LIBJVM) | 319 install_jvm: $(LIBJVM) |