Move the burg option out of Makefile.config into Makefile.common since

it no longer needs to be configured.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3828 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.common b/Makefile.common
index 20e2979b63b4ef51550a125647affe73d2716fa4..41afc1aa1e6ab995633082c3b4dedbd5a3b7f548 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -121,8 +121,12 @@ endif
 # Compilation options...
 #---------------------------------------------------------
 
-# Special tools used while building
-RunBurg  := $(BURG) $(BURG_OPTS)
+# Special tools used while building the LLVM tree.  Burg is built as part of the
+# utils directory.
+#
+BURG    := $(LEVEL)/utils/Burg/burg
+RunBurg := $(BURG) $(BURG_OPTS)
+
 
 # Enable this for profiling support with 'gprof'
 ifdef ENABLE_PROFILING
@@ -181,8 +185,8 @@ AR       = ar cq
 Source  := $(ExtraSource) $(wildcard *.cpp *.c *.y *.l)
 
 Objs := $(sort $(patsubst Debug/%.o, %.o, $(addsuffix .o,$(basename $(Source)))))
-ObjectsO = $(addprefix $(BUILD_ROOT)/Release/,$(Objs)))
-ObjectsG = $(addprefix $(BUILD_ROOT)/Debug/,$(Objs))
+ObjectsO := $(addprefix $(BUILD_ROOT)/Release/,$(Objs)))
+ObjectsG := $(addprefix $(BUILD_ROOT)/Debug/,$(Objs))
 
 
 #---------------------------------------------------------

diff --git a/Makefile.rules b/Makefile.rules
index 20e2979b63b4ef51550a125647affe73d2716fa4..41afc1aa1e6ab995633082c3b4dedbd5a3b7f548 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -121,8 +121,12 @@ endif
 # Compilation options...
 #---------------------------------------------------------
 
-# Special tools used while building
-RunBurg  := $(BURG) $(BURG_OPTS)
+# Special tools used while building the LLVM tree.  Burg is built as part of the
+# utils directory.
+#
+BURG    := $(LEVEL)/utils/Burg/burg
+RunBurg := $(BURG) $(BURG_OPTS)
+
 
 # Enable this for profiling support with 'gprof'
 ifdef ENABLE_PROFILING
@@ -181,8 +185,8 @@ AR       = ar cq
 Source  := $(ExtraSource) $(wildcard *.cpp *.c *.y *.l)
 
 Objs := $(sort $(patsubst Debug/%.o, %.o, $(addsuffix .o,$(basename $(Source)))))
-ObjectsO = $(addprefix $(BUILD_ROOT)/Release/,$(Objs)))
-ObjectsG = $(addprefix $(BUILD_ROOT)/Debug/,$(Objs))
+ObjectsO := $(addprefix $(BUILD_ROOT)/Release/,$(Objs)))
+ObjectsG := $(addprefix $(BUILD_ROOT)/Debug/,$(Objs))
 
 
 #---------------------------------------------------------