comparison make/bsd/makefiles/gcc.make @ 4129:f4414323345f

7116081: USE_PRECOMPILED_HEADER=0 triggers a single threaded build of the JVM Summary: Changed the conditional to see if the precompiled header has been specified. Also, removed the unused PrecompiledOption. Reviewed-by: dholmes, brutisso
author stefank
date Mon, 28 Nov 2011 14:58:31 +0100
parents 95009f678859
children 719f7007c8e8
comparison
equal deleted inserted replaced
4128:f1391adc6681 4129:f4414323345f
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