Skip to content

Use a proper fallback when git describe fails #6941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dlang-bot merged 1 commit into from
Jun 26, 2017
Merged

Use a proper fallback when git describe fails #6941

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/posix.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,10 +470,7 @@ $G/idgen: $D/idgen.d $(HOST_DMD_PATH)

VERSION := $(shell cat ../VERSION) # default to checked-in VERSION file
ifneq (1,$(RELEASE)) # unless building a release
VERSION_GIT := $(shell printf "`$(GIT) describe --dirty`") # use git describe
ifneq (,$(VERSION_GIT)) # check for git failures
VERSION := $(VERSION_GIT)
endif
VERSION := $(shell printf "`$(GIT) describe --dirty || cat ../VERSION`") # use git describe
endif

# only update $G/VERSION when it differs to avoid unnecessary rebuilds
Expand Down