From 2f3955dbc7fe97e4415231bc0204c5a4a3a9447b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 14 Jul 2019 09:28:49 +0200 Subject: [PATCH 009/170] src/Makefile: Simplify BUILD_ID logic. --- src/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Makefile b/src/Makefile index bbf594aa..87f1e823 100644 --- a/src/Makefile +++ b/src/Makefile @@ -52,15 +52,13 @@ ifdef USER_CFLAGS $(info USER_CFLAGS: $(USER_CFLAGS)) endif -ifdef BUILD_ID - $(info BUILD_ID: $(BUILD_ID)) -else +ifndef BUILD_ID BUILD_ID := Git $(shell git rev-parse --short HEAD 2>$(NULLDEV) || svnversion 2>$(NULLDEV)) ifneq ($(words $(BUILD_ID)),2) BUILD_ID := N/A - $(info BUILD_ID: N/A) endif endif +$(info BUILD_ID: $(BUILD_ID)) CFLAGS += -MMD -MP -O3 -I common \ -Wall -Wextra -Wno-char-subscripts $(USER_CFLAGS) \ -- 2.26.0