Skip to content

Commit

Permalink
Actually fix it (I'm pretty sure)
Browse files Browse the repository at this point in the history
  • Loading branch information
Epicpkmn11 committed Aug 12, 2019
1 parent e672020 commit 5e65b29
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arm9/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ ifeq ($(strip $(DEVKITARM)),)
$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
endif

# If the branch starts with 'v', assume it's a release build
ifeq ($(shell echo $(shell git rev-parse --abbrev-ref HEAD) | head -c 1), v)
GIT_VER := $(shell git rev-parse --abbrev-ref HEAD)
# If on a tagged commit, use the tag instead of the commit
ifneq ($(shell echo $(shell git describe --contains) | head -c 1),)
GIT_VER := $(shell git describe --contains)
else
GIT_VER := $(shell git rev-parse --short HEAD)
endif
Expand Down

0 comments on commit 5e65b29

Please sign in to comment.