aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.common4
-rw-r--r--Makefile.rules4
2 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.common b/Makefile.common
index e8cc9bad5d..f3f3cf159c 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -126,7 +126,7 @@ endif
# Special tools used while building the LLVM tree. Burg is built as part of the
# utils directory.
#
-BURG := $(TOOLDEBUG)/burg
+BURG := $(LEVEL)/utils/Burg/burg.$(UNAME)
RunBurg := $(BURG) $(BURG_OPTS)
@@ -198,7 +198,9 @@ BISON = bison
# source files...
# The local Makefile can list other Source files via ExtraSource = ...
#
+ifndef Source
Source := $(ExtraSource) $(wildcard *.cpp *.c *.y *.l)
+endif
Objs := $(sort $(patsubst Debug/%.o, %.o, $(addsuffix .o,$(basename $(Source)))))
ObjectsO := $(addprefix $(BUILD_ROOT)/Release/,$(Objs))
diff --git a/Makefile.rules b/Makefile.rules
index e8cc9bad5d..f3f3cf159c 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -126,7 +126,7 @@ endif
# Special tools used while building the LLVM tree. Burg is built as part of the
# utils directory.
#
-BURG := $(TOOLDEBUG)/burg
+BURG := $(LEVEL)/utils/Burg/burg.$(UNAME)
RunBurg := $(BURG) $(BURG_OPTS)
@@ -198,7 +198,9 @@ BISON = bison
# source files...
# The local Makefile can list other Source files via ExtraSource = ...
#
+ifndef Source
Source := $(ExtraSource) $(wildcard *.cpp *.c *.y *.l)
+endif
Objs := $(sort $(patsubst Debug/%.o, %.o, $(addsuffix .o,$(basename $(Source)))))
ObjectsO := $(addprefix $(BUILD_ROOT)/Release/,$(Objs))