1. Andreas Stenius
  2. oi-build

Commits

Andrew Stormont  committed d476c17 Draft

2167 illumos-userland needs support for git

  • Participants
  • Parent commits 8e8c25b
  • Branches default

Comments (0)

Files changed (1)

File make-rules/shared-macros.mk

View file
 
 export DOWNLOAD_SEARCH_PATH +=	$(ARCHIVE_MIRROR)
 
-# The workspace starts at the mercurial root
-export WS_TOP ?=		$(shell hg root)
+# The workspace starts at the mercurial/git root
+HG_ROOT = $(shell hg root 2>/dev/null)
+
+ifneq (,$(HG_ROOT))
+WS_TOP = $(HG_ROOT)
+else
+WS_TOP = $(shell dirname $(shell cd $(shell git rev-parse --git-dir) && pwd))
+endif
 
 # we want our pkg piplines to fail if there is an error
 # (like if pkgdepend fails in the middle of a pipe), but