Merge remote-tracking branch 'upstream/master' into a5200

[cc65] / src / Makefile

diff --git a/src/Makefile b/src/Makefile
index 81f28dee5ae3f2d5db0aab885313468e623ae3c7..2c2267ae78b76605181926c0769829a350ddb325 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -30,12 +30,27 @@ LD65_CFG = $(datadir)/cfg
 CC = $(CROSS_COMPILE)gcc
 AR = $(CROSS_COMPILE)ar
 
-CFLAGS += -MMD -MP -O -I common $(USER_CFLAGS) \
-          -Wall -Wextra -Wno-char-subscripts \
-          -DCA65_INC=$(CA65_INC) -DCC65_INC=$(CC65_INC) \
-          -DLD65_LIB=$(LD65_LIB) -DLD65_OBJ=$(LD65_OBJ) -DLD65_CFG=$(LD65_CFG)
+ifdef CROSS_COMPILE
+  $(info CC: $(CC))
+  $(info AR: $(AR))
+endif
+
+ifdef USER_CFLAGS
+  $(info USER_CFLAGS: $(USER_CFLAGS))
+endif
+
+ifndef GIT_SHA
+  GIT_SHA := $(if $(wildcard ../.git),$(shell git rev-parse --short HEAD))
+  ifneq ($(words $(GIT_SHA)),1)
+    GIT_SHA := N/A
+  endif
+endif
+$(info GIT_SHA: $(GIT_SHA))
 
-CFLAGS += $(if $(TRAVIS),-Werror)
+CFLAGS += -MMD -MP -O -I common \
+          -Wall -Wextra -Wno-char-subscripts $(USER_CFLAGS) \
+          -DGIT_SHA=$(GIT_SHA) -DCA65_INC=$(CA65_INC) -DCC65_INC=$(CC65_INC) \
+          -DLD65_LIB=$(LD65_LIB) -DLD65_OBJ=$(LD65_OBJ) -DLD65_CFG=$(LD65_CFG)
 
 LDLIBS += -lm