Author: gordon
Date: Sun Jan 6 15:54:35 2008
New Revision: 45663
URL: http://llvm.org/viewvc/llvm-project?rev=45663&view=rev
Log:
Modify Makefile.rules to allow makefiles to prepend to C.Flags and
fiends. Change Makefile.ocaml to not touch CFLAGS.
Modified:
llvm/trunk/Makefile.rules
llvm/trunk/bindings/ocaml/Makefile.ocaml
Modified: llvm/trunk/Makefile.rules
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.rules?rev=45663&r1=45662&r2=45663&view=diff
==============================================================================
--- llvm/trunk/Makefile.rules (original)
+++ llvm/trunk/Makefile.rules Sun Jan 6 15:54:35 2008
@@ -210,9 +210,9 @@
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 @@
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
Modified: llvm/trunk/bindings/ocaml/Makefile.ocaml
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/ocaml/Makefile.ocaml?rev=45663&r1=45662&r2=45663&view=diff
==============================================================================
--- llvm/trunk/bindings/ocaml/Makefile.ocaml (original)
+++ llvm/trunk/bindings/ocaml/Makefile.ocaml Sun Jan 6 15:54:35 2008
@@ -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
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
