diff options
| author | Gordon Henriksen <gordonhenriksen@mac.com> | 2008-01-06 21:54:35 +0000 |
|---|---|---|
| committer | Gordon Henriksen <gordonhenriksen@mac.com> | 2008-01-06 21:54:35 +0000 |
| commit | db911e90371ddc2228e9233ecc6cbc9d5b0b1b12 (patch) | |
| tree | 8ee8ad99586bb9cc0ab4a5955b6ed42555db4a57 | |
| parent | 2a1993fb2cc322ab15215f95b2b8b26840323e96 (diff) | |
| download | bcm5719-llvm-db911e90371ddc2228e9233ecc6cbc9d5b0b1b12.tar.gz bcm5719-llvm-db911e90371ddc2228e9233ecc6cbc9d5b0b1b12.zip | |
Modify Makefile.rules to allow makefiles to prepend to C.Flags and
fiends. Change Makefile.ocaml to not touch CFLAGS.
llvm-svn: 45663
| -rw-r--r-- | llvm/Makefile.rules | 18 | ||||
| -rw-r--r-- | llvm/bindings/ocaml/Makefile.ocaml | 3 |
2 files changed, 11 insertions, 10 deletions
diff --git a/llvm/Makefile.rules b/llvm/Makefile.rules index e3a1009b862..2cdb63efe4e 100644 --- a/llvm/Makefile.rules +++ b/llvm/Makefile.rules @@ -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 diff --git a/llvm/bindings/ocaml/Makefile.ocaml b/llvm/bindings/ocaml/Makefile.ocaml index 15edb01ff32..6fc9a9a7d89 100644 --- a/llvm/bindings/ocaml/Makefile.ocaml +++ b/llvm/bindings/ocaml/Makefile.ocaml @@ -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 |
