:: commit 2bdd297c3dd257e2dcfd29be2511c9bbd6801018

mintsuki <mintsuki@protonmail.com> — 2021-04-02 14:19

parents: dce8d312ea

build: Pull actual branch name from git rather than hardcoding 'trunk'

diff --git a/stage23/Makefile b/stage23/Makefile
index 785b2202..101afc88 100644
--- a/stage23/Makefile
+++ b/stage23/Makefile
@@ -23,7 +23,7 @@ COM_OUTPUT = false
 E9_OUTPUT = false
 
 BUILD_ID := $(shell dd if=/dev/urandom count=8 bs=1 | od -An -t x8 | sed 's/^ /0x/')
-LIMINE_VERSION := $(shell git describe --exact-match --tags `git log -n1 --pretty='%h'` || ( git log -n1 --pretty='%h' && echo -n "(trunk)" ) )
+LIMINE_VERSION := $(shell git describe --exact-match --tags `git log -n1 --pretty='%h'` || ( git log -n1 --pretty='%h' && echo -n "(`git branch --show-current`)" ) )
 WERROR = -Werror
 CFLAGS = -O3 -g -pipe -Wall -Wextra $(WERROR)
 S2CFLAGS = -Os -g -pipe -Wall -Wextra $(WERROR)
tab: 248 wrap: offon