summaryrefslogtreecommitdiff
path: root/libstd
diff options
context:
space:
mode:
authorOri Bernstein <ori@eigenstate.org>2015-03-04 10:12:34 -0800
committerOri Bernstein <ori@eigenstate.org>2015-03-04 10:20:27 -0800
commitf015b7cbb577ea4ba9ff9c8a6ad40e545b3d0a02 (patch)
treef93c3a177b7ca8de6a955e35e393d57e0e5f75e2 /libstd
parentce5ecc308dbdd204fc3f5c3e6f6cf085a2c5d846 (diff)
downloadmc-f015b7cbb577ea4ba9ff9c8a6ad40e545b3d0a02.tar.gz
Fix new builds.
- mbld doesn't need the files passed on the command line. - the system specific myr files should be listed in the makefile.
Diffstat (limited to 'libstd')
-rw-r--r--libstd/Makefile4
-rwxr-xr-xlibstd/build.sh2
2 files changed, 5 insertions, 1 deletions
diff --git a/libstd/Makefile b/libstd/Makefile
index f3cd561..c0df0e3 100644
--- a/libstd/Makefile
+++ b/libstd/Makefile
@@ -66,6 +66,7 @@ STDSRC= \
strsplit.myr \
strstrip.myr \
syswrap.myr \
+ syswrap-ss.myr \
swap.myr \
try.myr \
types.myr \
@@ -81,6 +82,9 @@ all: lib$(STDLIB).a $(MYRBIN)
%.myr: %+$(SYSCLASS)-$(ARCH).myr
cp $< $@
+%.myr: %+$(SYSCLASS)-$(SYS).myr
+ cp $< $@
+
%.myr: %+$(SYSCLASS).myr
cp $< $@
diff --git a/libstd/build.sh b/libstd/build.sh
index 6036119..3c1aa99 100755
--- a/libstd/build.sh
+++ b/libstd/build.sh
@@ -3,6 +3,6 @@
if [ -z "`which mbld`" ]; then
../myrbuild/myrbuild -I. -C$MYR_MC -M$MYR_MUSE $@
else
- mbld $@
+ mbld
fi