From: David Given <dg@cowlark.com>
Date: Sat, 19 Mar 2016 13:52:29 +0000 (+0100)
Subject: Make sure that pcc and the assembler build in different directories to
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=794d3973d1596dd89662aef9e80a4fe01393bdf7;p=ack.git

Make sure that pcc and the assembler build in different directories to
prevent y.tab.c stomping.

--HG--
branch : default-branch
---

diff --git a/mach/proto/as/build.mk b/mach/proto/as/build.mk
index 64c75cf91..ef094917d 100644
--- a/mach/proto/as/build.mk
+++ b/mach/proto/as/build.mk
@@ -1,38 +1,40 @@
 define build-as-impl
+	$(eval E := $(OBJDIR)/$D/as)
+
     $(call reset)
 
-    $(eval cflags += -Imach/$(ARCH)/as -I$(OBJDIR)/$D)
+    $(eval cflags += -Imach/$(ARCH)/as -I$E)
     $(eval objdir := $(ARCH))
 
     $(call cfile, mach/proto/as/comm3.c)
-    $(call dependson, $(OBJDIR)/$D/y.tab.h)
+    $(call dependson, $E/y.tab.h)
 
     $(call cfile, mach/proto/as/comm4.c)
-    $(call dependson, $(OBJDIR)/$D/y.tab.h)
+    $(call dependson, $E/y.tab.h)
 
     $(call cfile, mach/proto/as/comm5.c)
-    $(call dependson, $(OBJDIR)/$D/y.tab.h)
+    $(call dependson, $E/y.tab.h)
 
     $(call cfile, mach/proto/as/comm6.c)
-    $(call dependson, $(OBJDIR)/$D/y.tab.h)
+    $(call dependson, $E/y.tab.h)
 
     $(call cfile, mach/proto/as/comm7.c)
-    $(call dependson, $(OBJDIR)/$D/y.tab.h)
+    $(call dependson, $E/y.tab.h)
 
     $(call cfile, mach/proto/as/comm8.c)
-    $(call dependson, $(OBJDIR)/$D/y.tab.h)
+    $(call dependson, $E/y.tab.h)
 
-	$(call yacc, $(OBJDIR)/$D, $(OBJDIR)/$D/preprocessed-comm2.y)
+	$(call yacc, $E, $E/preprocessed-comm2.y)
 
 	$(call rawfile, $(LIBOBJECT))
     $(call cprogram, $(BINDIR)/$(PLATFORM)/as)
     $(call installto, $(PLATDEP)/$(PLATFORM)/as)
 
 	$(call reset)
-    $(eval cflags += -Imach/$(ARCH)/as -I$(OBJDIR)/$D)
+    $(eval cflags += -Imach/$(ARCH)/as -I$E)
     $(eval objdir := $(ARCH))
 	$(call cppfile, mach/proto/as/comm2.y)
-	$(call installto, $(OBJDIR)/$D/preprocessed-comm2.y)
+	$(call installto, $E/preprocessed-comm2.y)
 
     $(call reset)
     $(call rawfile, man/$(ARCH)_as.6)
diff --git a/plat/build.mk b/plat/build.mk
index f7102032c..5cd80b9b6 100644
--- a/plat/build.mk
+++ b/plat/build.mk
@@ -8,7 +8,7 @@ endef
 
 define build-platform-impl
     $(call reset)
-	$(eval q := $D/descr)
+	$(call rawfile, $D/descr)
 	$(call installto, $(PLATIND)/descr/$(PLATFORM))
 
 	$(foreach f, $(platform-headers), $(call build-platform-headers, $f))
@@ -66,10 +66,17 @@ endef
 build-platform = $(eval $(call build-platform-impl, $1))
 
 define build-pcc-platform-impl
+    $(call reset)
+	$(call rawfile, $D/descr)
+	$(call installto, $(PLATIND)/descr/$(PLATFORM))
+
 	$(eval PLATFORM_$(PLATFORM) := \
+			$(PLATIND)/descr/$(PLATFORM) \
+			$(PLATDEP)/$(PLATFORM)/as \
 			$(PLATDEP)/$(PLATFORM)/pcc_ccom \
 	)
 
+	$(call build-as)
 	$(call build-pcc)
 endef