974b936917
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/efivar#9f54d8029387895b7b1389d9a9f9e0bf476a027f
37 lines
1.0 KiB
Diff
37 lines
1.0 KiB
Diff
From 15a379e4764ae5a3f5d8fdf224410c7eaa74c66a Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Wed, 29 May 2019 10:21:32 -0400
|
|
Subject: [PATCH 23/86] Do a better job of making sure -DLIBEFIVAR_VERSION
|
|
happens...
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
Make.defaults | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/Make.defaults b/Make.defaults
|
|
index 6c575846687..80fd99eba71 100644
|
|
--- a/Make.defaults
|
|
+++ b/Make.defaults
|
|
@@ -18,7 +18,7 @@ CCLD_FOR_BUILD ?= $(CC_FOR_BUILD)
|
|
CCLD := $(if $(filter undefined,$(origin CCLD)),$(CC),$(CCLD))
|
|
OPTIMIZE ?= -O2 -flto
|
|
CFLAGS ?= $(OPTIMIZE) -g3
|
|
-CFLAGS := $(CFLAGS) -DLIBEFIVAR_VERSION=$(VERSION)
|
|
+CFLAGS := $(CFLAGS)
|
|
LDFLAGS ?=
|
|
LDFLAGS := $(LDFLAGS)
|
|
AR := $(CROSS_COMPILE)$(COMPILER)-ar
|
|
@@ -29,6 +29,8 @@ ABIDIFF := abidiff
|
|
|
|
PKGS =
|
|
|
|
+CPPFLAGS += -DLIBEFIVAR_VERSION=$(VERSION)
|
|
+
|
|
clang_cflags = -D_GNU_SOURCE -std=gnu11 -Wno-address-of-packed-member
|
|
gcc_cflags = -specs=$(TOPDIR)/gcc.specs
|
|
cflags = $(CFLAGS) -I${TOPDIR}/src/include/ \
|
|
--
|
|
2.24.1
|
|
|