Mercurial > hg > truffle
comparison make/linux/makefiles/rules.make @ 235:9c2ecc2ffb12 jdk7-b31
Merge
author | trims |
---|---|
date | Fri, 11 Jul 2008 01:14:44 -0700 |
parents | d1605aabd0a1 f232d7d67023 |
children | 0fc81f0a8ca8 |
comparison
equal
deleted
inserted
replaced
197:de141433919f | 235:9c2ecc2ffb12 |
---|---|
131 # With parallel makes, print a message at the end of compilation. | 131 # With parallel makes, print a message at the end of compilation. |
132 ifeq ($(findstring j,$(MFLAGS)),j) | 132 ifeq ($(findstring j,$(MFLAGS)),j) |
133 COMPILE_DONE = && { echo Done with $<; } | 133 COMPILE_DONE = && { echo Done with $<; } |
134 endif | 134 endif |
135 | 135 |
136 # Include $(NONPIC_OBJ_FILES) definition | |
137 ifndef LP64 | |
138 include $(GAMMADIR)/make/pic.make | |
139 endif | |
140 | |
141 # The non-PIC object files are only generated for 32 bit platforms. | |
142 ifdef LP64 | |
136 %.o: %.cpp | 143 %.o: %.cpp |
137 @echo Compiling $< | 144 @echo Compiling $< |
138 $(QUIETLY) $(REMOVE_TARGET) | 145 $(QUIETLY) $(REMOVE_TARGET) |
139 $(QUIETLY) $(COMPILE.CC) -o $@ $< $(COMPILE_DONE) | 146 $(QUIETLY) $(COMPILE.CC) -o $@ $< $(COMPILE_DONE) |
147 else | |
148 %.o: %.cpp | |
149 @echo Compiling $< | |
150 $(QUIETLY) $(REMOVE_TARGET) | |
151 $(QUIETLY) $(if $(findstring $@, $(NONPIC_OBJ_FILES)), \ | |
152 $(subst $(VM_PICFLAG), ,$(COMPILE.CC)) -o $@ $< $(COMPILE_DONE), \ | |
153 $(COMPILE.CC) -o $@ $< $(COMPILE_DONE)) | |
154 endif | |
140 | 155 |
141 %.o: %.s | 156 %.o: %.s |
142 @echo Assembling $< | 157 @echo Assembling $< |
143 $(QUIETLY) $(REMOVE_TARGET) | 158 $(QUIETLY) $(REMOVE_TARGET) |
144 $(QUIETLY) $(AS.S) -o $@ $< $(COMPILE_DONE) | 159 $(QUIETLY) $(AS.S) -o $@ $< $(COMPILE_DONE) |