equal
deleted
inserted
replaced
84 |
84 |
85 # check for precompiled headers support |
85 # check for precompiled headers support |
86 ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 3 \) \| \( \( $(CC_VER_MAJOR) = 3 \) \& \( $(CC_VER_MINOR) \>= 4 \) \))" "0" |
86 ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 3 \) \| \( \( $(CC_VER_MAJOR) = 3 \) \& \( $(CC_VER_MINOR) \>= 4 \) \))" "0" |
87 # Allow the user to turn off precompiled headers from the command line. |
87 # Allow the user to turn off precompiled headers from the command line. |
88 ifneq ($(USE_PRECOMPILED_HEADER),0) |
88 ifneq ($(USE_PRECOMPILED_HEADER),0) |
89 USE_PRECOMPILED_HEADER=1 |
|
90 PRECOMPILED_HEADER_DIR=. |
89 PRECOMPILED_HEADER_DIR=. |
91 PRECOMPILED_HEADER_SRC=$(GAMMADIR)/src/share/vm/precompiled/precompiled.hpp |
90 PRECOMPILED_HEADER_SRC=$(GAMMADIR)/src/share/vm/precompiled/precompiled.hpp |
92 PRECOMPILED_HEADER=$(PRECOMPILED_HEADER_DIR)/precompiled.hpp.gch |
91 PRECOMPILED_HEADER=$(PRECOMPILED_HEADER_DIR)/precompiled.hpp.gch |
93 endif |
92 endif |
94 endif |
93 endif |
214 ifneq ("${CC_VER_MAJOR}", "2") |
213 ifneq ("${CC_VER_MAJOR}", "2") |
215 DEPFLAGS = -MMD -MP -MF $(DEP_DIR)/$(@:%=%.d) |
214 DEPFLAGS = -MMD -MP -MF $(DEP_DIR)/$(@:%=%.d) |
216 endif |
215 endif |
217 |
216 |
218 # -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp. |
217 # -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp. |
219 ifneq ($(USE_PRECOMPILED_HEADER),1) |
218 ifeq ($(USE_PRECOMPILED_HEADER),0) |
220 CFLAGS += -DDONT_USE_PRECOMPILED_HEADER |
219 CFLAGS += -DDONT_USE_PRECOMPILED_HEADER |
221 endif |
220 endif |
222 |
221 |
223 #------------------------------------------------------------------------ |
222 #------------------------------------------------------------------------ |
224 # Linker flags |
223 # Linker flags |