summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOri Bernstein <orib@google.com>2013-01-25 18:49:04 -0500
committerOri Bernstein <orib@google.com>2013-01-25 18:49:04 -0500
commit3a45cf391fee2805331c88d6947f3bdbd8689478 (patch)
tree0f64cf7be596b5f2d7dc3246601a1e1c81b7c785
parentfac62869f84de9faad47572fef07654391de2e81 (diff)
downloadmc-3a45cf391fee2805331c88d6947f3bdbd8689478.tar.gz
Rebuild libstd if 6m is rebuilt.
Debugging test issues because we forgot to rebuild libstd sucks.
-rw-r--r--libstd/Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/libstd/Makefile b/libstd/Makefile
index 02e5a5f..07cdf65 100644
--- a/libstd/Makefile
+++ b/libstd/Makefile
@@ -34,12 +34,12 @@ syscall.s: syscall-$(SYS).s
start.s: start-$(SYS).s
cp start-$(SYS).s start.s
-test: libstd.a test.myr
+test: libstd.a test.myr ../6/6m
../myrbuild/myrbuild -C../6/6m -M../muse/muse -b test -I. test.myr
-$(MYRLIB): $(MYRSRC) $(ASMSRC)
- ../myrbuild/myrbuild -C../6/6m -M../muse/muse -l $(MYRLIB) $^
+$(MYRLIB): $(MYRSRC) $(ASMSRC) ../6/6m
+ ../myrbuild/myrbuild -C../6/6m -M../muse/muse -l $(MYRLIB) $(MYRSRC) $(ASMSRC)
OBJ=$(MYRSRC:.myr=.o) $(ASMSRC:.s=.o)
JUNKASM=$(MYRSRC:.myr=.s)
@@ -55,3 +55,6 @@ install:
mkdir -p $(INST_ROOT)/lib/myr
install libstd.a $(INST_ROOT)/lib/myr
install std $(INST_ROOT)/lib/myr
+
+../6/6m:
+ cd ..; make