Squashed 'deps/ox/' changes from 68c144f..56d91c1
56d91c1Fix delete/new[] mismatch8a07138Fix m_store delete to use delete[]b4a6aedChange auto expand to own buff attribute in OxFS7fa43daMake auto expand loop if necessaryc1e8d07Fix auto expand conditiond43aecdAdd auto expand to OxFSd778570Merge branch 'master' of github.com:wombatant/ox4798e54Add -s flag to nested make calls038ca96Add missing error reporting to file system lsac3f12fRemove unnecessary ls from FileSystemTemplatec19a717Fix readDirectory use the right type of directory4a44a23Add default constructor for DirectoryListing git-subtree-dir: deps/ox git-subtree-split:56d91c18bd
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user