ref: 3a45cf391fee2805331c88d6947f3bdbd8689478
parent: fac62869f84de9faad47572fef07654391de2e81
author: Ori Bernstein <[email protected]>
date: Fri Jan 25 13:49:04 EST 2013
Rebuild libstd if 6m is rebuilt.
Debugging test issues because we forgot to rebuild libstd sucks.
--- a/libstd/Makefile
+++ b/libstd/Makefile
@@ -34,12 +34,12 @@
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 @@
mkdir -p $(INST_ROOT)/lib/myr
install libstd.a $(INST_ROOT)/lib/myr
install std $(INST_ROOT)/lib/myr
+
+../6/6m:
+ cd ..; make