09820226ae
Rebase on upstream commit 32611aea6543
See
$ cd SELinuxProject/selinux
$ git log --pretty=oneline checkpolicy-3.2..32611aea6543 -- checkpolicy
55 lines
1.7 KiB
Diff
55 lines
1.7 KiB
Diff
From 40e2f98519ba3fc6a4a0f2b4a2b8b0e1d864fd9e Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
|
Date: Tue, 6 Jul 2021 19:54:21 +0200
|
|
Subject: [PATCH] checkpolicy: pass CFLAGS at link stage
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Pass CFLAGS when invoking CC at link time, it might contain optimization
|
|
or sanitizer flags required for linking.
|
|
|
|
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
|
|
---
|
|
checkpolicy/Makefile | 4 ++--
|
|
checkpolicy/test/Makefile | 4 ++--
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/checkpolicy/Makefile b/checkpolicy/Makefile
|
|
index 0d282ef93d14..be63c0182682 100644
|
|
--- a/checkpolicy/Makefile
|
|
+++ b/checkpolicy/Makefile
|
|
@@ -30,10 +30,10 @@ all: $(TARGETS)
|
|
$(MAKE) -C test
|
|
|
|
checkpolicy: $(CHECKPOLOBJS) $(LIBSEPOLA)
|
|
- $(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS_LIBSEPOLA)
|
|
+ $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS_LIBSEPOLA)
|
|
|
|
checkmodule: $(CHECKMODOBJS) $(LIBSEPOLA)
|
|
- $(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS_LIBSEPOLA)
|
|
+ $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LDLIBS_LIBSEPOLA)
|
|
|
|
%.o: %.c
|
|
$(CC) $(CFLAGS) -o $@ -c $<
|
|
diff --git a/checkpolicy/test/Makefile b/checkpolicy/test/Makefile
|
|
index 89e7557c7aa6..e2a332b5a079 100644
|
|
--- a/checkpolicy/test/Makefile
|
|
+++ b/checkpolicy/test/Makefile
|
|
@@ -13,10 +13,10 @@ endif
|
|
all: dispol dismod
|
|
|
|
dispol: dispol.o $(LIBSEPOLA)
|
|
- $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS_LIBSEPOLA)
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS_LIBSEPOLA)
|
|
|
|
dismod: dismod.o $(LIBSEPOLA)
|
|
- $(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS_LIBSEPOLA)
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS_LIBSEPOLA)
|
|
|
|
clean:
|
|
-rm -f dispol dismod *.o
|
|
--
|
|
2.32.0
|
|
|