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 | 099688622c0d888df945cf4b3bc4c52ef414ef3b (patch) | |
| tree | 1f93e2efb67bb3aef4d2d6dcf36a61964b5f2f86 | |
| parent | 21003c8d58f2475adb2f0b8d2f0dd056ccf4fc5b (diff) | |
| download | external_llvm-099688622c0d888df945cf4b3bc4c52ef414ef3b.zip external_llvm-099688622c0d888df945cf4b3bc4c52ef414ef3b.tar.gz external_llvm-099688622c0d888df945cf4b3bc4c52ef414ef3b.tar.bz2 | |
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
| -rw-r--r-- | Makefile.rules | 18 | ||||
| -rw-r--r-- | bindings/ocaml/Makefile.ocaml | 3 |
2 files changed, 11 insertions, 10 deletions
diff --git a/Makefile.rules b/Makefile.rules index e3a1009..2cdb63e 100644 --- a/Makefile.rules +++ b/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/bindings/ocaml/Makefile.ocaml b/bindings/ocaml/Makefile.ocaml index 15edb01..6fc9a9a 100644 --- a/bindings/ocaml/Makefile.ocaml +++ b/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 |