Squashed 'deps/ox/' changes from 68c144f..56d91c1

56d91c1 Fix delete/new[] mismatch
8a07138 Fix m_store delete to use delete[]
b4a6aed Change auto expand to own buff attribute in OxFS
7fa43da Make auto expand loop if necessary
c1e8d07 Fix auto expand condition
d43aecd Add auto expand to OxFS
d778570 Merge branch 'master' of github.com:wombatant/ox
4798e54 Add -s flag to nested make calls
038ca96 Add missing error reporting to file system ls
ac3f12f Remove unnecessary ls from FileSystemTemplate
c19a717 Fix readDirectory use the right type of directory
4a44a23 Add default constructor for DirectoryListing

git-subtree-dir: deps/ox
git-subtree-split: 56d91c18bd8a10b5ca5ff3986e44da3b194a09a0
This commit is contained in:
2017-07-01 02:31:26 -05:00
parent f92c8ab577
commit feb7e4c184
4 changed files with 54 additions and 51 deletions

View File

@@ -3,9 +3,9 @@ HOST_ENV=${OS}-$(shell uname -m)
DEVENV=devenv$(shell pwd | sed 's/\//-/g')
DEVENV_IMAGE=wombatant/devenv
ifneq ($(shell which gmake),)
MAKE=gmake
MAKE=gmake -s
else
MAKE=make
MAKE=make -s
endif
ifneq ($(shell which docker 2>&1),)
ifeq ($(shell docker inspect --format="{{.State.Status}}" ${DEVENV} 2>&1),running)