From d8ebdea05f5d5627c30af200803cca4008417e0a Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Sun, 18 Aug 2019 01:56:20 -0400 Subject: [PATCH] handle CONFIG_SEAL_METADATA option like the others --- Makefile | 5 +++-- util.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e2530c0..4cec832 100644 --- a/Makefile +++ b/Makefile @@ -53,8 +53,8 @@ ifeq ($(CONFIG_UBSAN),true) CXXFLAGS += -fsanitize=undefined endif -ifeq ($(CONFIG_SEAL_METADATA),true) - CPPFLAGS += -DCONFIG_SEAL_METADATA +ifeq (,$(filter $(CONFIG_SEAL_METADATA),true false)) + $(error CONFIG_SEAL_METADATA must be true or false) endif ifeq (,$(filter $(CONFIG_ZERO_ON_FREE),true false)) @@ -86,6 +86,7 @@ ifeq (,$(filter $(CONFIG_STATS),true false)) endif CPPFLAGS += \ + -DCONFIG_SEAL_METADATA=$(CONFIG_SEAL_METADATA) \ -DZERO_ON_FREE=$(CONFIG_ZERO_ON_FREE) \ -DWRITE_AFTER_FREE_CHECK=$(CONFIG_WRITE_AFTER_FREE_CHECK) \ -DSLOT_RANDOMIZE=$(CONFIG_SLOT_RANDOMIZE) \ diff --git a/util.h b/util.h index 3e76fd7..5f2274a 100644 --- a/util.h +++ b/util.h @@ -51,7 +51,7 @@ extern int __register_atfork(void (*)(void), void (*)(void), void (*)(void), voi #define atfork pthread_atfork #endif -#ifdef CONFIG_SEAL_METADATA +#if CONFIG_SEAL_METADATA #ifdef __GLIBC__ #if __GLIBC_PREREQ(2, 27)