Modify Makefile.rules to allow makefiles to prepend to C.Flags and
fiends. Change Makefile.ocaml to not touch CFLAGS. llvm-svn: 45663
This commit is contained in:
parent
2a1993fb2c
commit
db911e9037
|
@ -210,9 +210,9 @@ endif
|
|||
|
||||
ifdef ENABLE_PROFILING
|
||||
BuildMode := Profile
|
||||
CXX.Flags := $(OPTIMIZE_OPTION) -pg -g
|
||||
C.Flags := $(OPTIMIZE_OPTION) -pg -g
|
||||
LD.Flags := $(OPTIMIZE_OPTION) -pg -g
|
||||
CXX.Flags += $(OPTIMIZE_OPTION) -pg -g
|
||||
C.Flags += $(OPTIMIZE_OPTION) -pg -g
|
||||
LD.Flags += $(OPTIMIZE_OPTION) -pg -g
|
||||
KEEP_SYMBOLS := 1
|
||||
else
|
||||
ifeq ($(ENABLE_OPTIMIZED),1)
|
||||
|
@ -229,14 +229,14 @@ else
|
|||
EXTRA_OPTIONS += -fstrict-aliasing
|
||||
endif
|
||||
|
||||
CXX.Flags := $(OPTIMIZE_OPTION) $(OmitFramePointer)
|
||||
C.Flags := $(OPTIMIZE_OPTION) $(OmitFramePointer)
|
||||
LD.Flags := $(OPTIMIZE_OPTION)
|
||||
CXX.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer)
|
||||
C.Flags += $(OPTIMIZE_OPTION) $(OmitFramePointer)
|
||||
LD.Flags += $(OPTIMIZE_OPTION)
|
||||
else
|
||||
BuildMode := Debug
|
||||
CXX.Flags := -g
|
||||
C.Flags := -g
|
||||
LD.Flags := -g
|
||||
CXX.Flags += -g
|
||||
C.Flags += -g
|
||||
LD.Flags += -g
|
||||
KEEP_SYMBOLS := 1
|
||||
endif
|
||||
endif
|
||||
|
|
|
@ -20,7 +20,8 @@
|
|||
include $(LEVEL)/Makefile.config
|
||||
|
||||
# CFLAGS needs to be set before Makefile.rules is included.
|
||||
CFLAGS += -I"$(shell $(OCAMLC) -where)"
|
||||
CXX.Flags += -I"$(shell $(OCAMLC) -where)"
|
||||
C.Flags += -I"$(shell $(OCAMLC) -where)"
|
||||
|
||||
include $(LEVEL)/Makefile.common
|
||||
|
||||
|
|
Loading…
Reference in New Issue