llvm.org GIT mirror llvm / 9e7aba2
Modify Makefile.rules to allow makefiles to prepend to C.Flags and fiends. Change Makefile.ocaml to not touch CFLAGS. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@45663 91177308-0d34-0410-b5e6-96231b3b80d8 Gordon Henriksen 12 years ago
2 changed file(s) with 11 addition(s) and 10 deletion(s). Raw diff Collapse all Expand all
209209
210210 ifdef ENABLE_PROFILING
211211 BuildMode := Profile
212 CXX.Flags := $(OPTIMIZE_OPTION) -pg -g
213 C.Flags := $(OPTIMIZE_OPTION) -pg -g
214 LD.Flags := $(OPTIMIZE_OPTION) -pg -g
212 CXX.Flags += $(OPTIMIZE_OPTION) -pg -g
213 C.Flags += $(OPTIMIZE_OPTION) -pg -g
214 LD.Flags += $(OPTIMIZE_OPTION) -pg -g
215215 KEEP_SYMBOLS := 1
216216 else
217217 ifeq ($(ENABLE_OPTIMIZED),1)
228228 EXTRA_OPTIONS += -fstrict-aliasing
229229 endif
230230
231 CXX.Flags := $(OPTIMIZE_OPTION) $(OmitFramePointer)
232 C.Flags := $(OPTIMIZE_OPTION) $(OmitFramePointer)
233 LD.Flags := $(OPTIMIZE_OPTION)
231 CXX.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer)
232 C.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer)
233 LD.Flags += $(OPTIMIZE_OPTION)
234234 else
235235 BuildMode := Debug
236 CXX.Flags := -g
237 C.Flags := -g
238 LD.Flags := -g
236 CXX.Flags += -g
237 C.Flags += -g
238 LD.Flags += -g
239239 KEEP_SYMBOLS := 1
240240 endif
241241 endif
1919 include $(LEVEL)/Makefile.config
2020
2121 # CFLAGS needs to be set before Makefile.rules is included.
22 CFLAGS += -I"$(shell $(OCAMLC) -where)"
22 CXX.Flags += -I"$(shell $(OCAMLC) -where)"
23 C.Flags += -I"$(shell $(OCAMLC) -where)"
2324
2425 include $(LEVEL)/Makefile.common
2526