Merge branch 'strawberry-dev' of github.com:klange/toaruos into strawberry-dev
This commit is contained in:
commit
ecf124ece4
4
Makefile
4
Makefile
@ -67,7 +67,7 @@ run-config: system
|
||||
util/config-parser ${EMU}
|
||||
|
||||
test: system
|
||||
python util/run-tests.py 2>/dev/null
|
||||
python2 util/run-tests.py 2>/dev/null
|
||||
|
||||
.passed:
|
||||
@util/check-reqs > /dev/null
|
||||
@ -99,7 +99,7 @@ kernel/sys/version.o: kernel/*/*.c kernel/*.c
|
||||
####################
|
||||
|
||||
.userspace-check: ${USERSPACE}
|
||||
@cd userspace && python build.py
|
||||
@cd userspace && python2 build.py
|
||||
@touch .userspace-check
|
||||
|
||||
toaruos-disk.img: .userspace-check
|
||||
|
@ -1,4 +1,4 @@
|
||||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python2
|
||||
# -*- coding: utf-8 -*-
|
||||
"""
|
||||
JuJu - An automagical build tool for the とあるOS userspace.
|
||||
|
Loading…
Reference in New Issue
Block a user