8c4df606a2
optimize compile options fix build error permission denied, do not use -i in pie buildmode Signed-off-by: Vanient <xiadanni1@huawei.com>
48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
From a769423a86b87fe9c1a819e0b6885ff1d2c472fe Mon Sep 17 00:00:00 2001
|
|
From: Vanient <xiadanni1@huawei.com>
|
|
Date: Mon, 13 Nov 2023 17:21:41 +0800
|
|
Subject: [PATCH] runtime: use buildmode pie to build containerd-shim-kata-v2
|
|
|
|
Signed-off-by: Vanient <xiadanni1@huawei.com>
|
|
---
|
|
Makefile | 10 +++++++---
|
|
1 file changed, 7 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 9957db9..0d23e24 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -522,7 +522,7 @@ containerd-shim-v2: $(SHIMV2_OUTPUT)
|
|
netmon: $(NETMON_TARGET_OUTPUT)
|
|
|
|
$(NETMON_TARGET_OUTPUT): $(SOURCES) VERSION
|
|
- $(QUIET_BUILD)(cd $(NETMON_DIR) && \
|
|
+ (cd $(NETMON_DIR) && \
|
|
CGO_CFLAGS="-fstack-protector-strong -fPIE -D_FORTIFY_SOURCE=2 -O2" \
|
|
CGO_LDFLAGS_ALLOW="-Wl,-z,relro,-z,now" \
|
|
CGO_LDFLAGS="-Wl,-z,relro,-z,now -Wl,-z,noexecstack" \
|
|
@@ -564,14 +564,18 @@ GENERATED_FILES += $(CLI_DIR)/config-generated.go
|
|
GENERATED_FILES += pkg/katautils/config-settings.go
|
|
|
|
$(TARGET_OUTPUT): $(SOURCES) $(GENERATED_FILES) $(MAKEFILE_LIST) | show-summary
|
|
- $(QUIET_BUILD)(cd $(CLI_DIR) && \
|
|
+ (cd $(CLI_DIR) && \
|
|
CGO_CFLAGS="-fstack-protector-strong -fPIE -D_FORTIFY_SOURCE=2 -O2" \
|
|
CGO_LDFLAGS_ALLOW="-Wl,-z,relro,-z,now" \
|
|
CGO_LDFLAGS="-Wl,-z,relro,-z,now -Wl,-z,noexecstack" \
|
|
go build $(KATA_LDFLAGS) $(BUILDFLAGS) -o $@ -ldflags "-linkmode=external" .)
|
|
|
|
$(SHIMV2_OUTPUT): $(SOURCES) $(GENERATED_FILES) $(MAKEFILE_LIST)
|
|
- $(QUIET_BUILD)(cd $(SHIMV2_DIR)/ && go build $(KATA_LDFLAGS) -i -o $@ .)
|
|
+ (cd $(SHIMV2_DIR) && \
|
|
+ CGO_CFLAGS="-fstack-protector-strong -fPIE -D_FORTIFY_SOURCE=2 -O2" \
|
|
+ CGO_LDFLAGS_ALLOW="-Wl,-z,relro,-z,now" \
|
|
+ CGO_LDFLAGS="-Wl,-z,relro,-z,now -Wl,-z,noexecstack" \
|
|
+ go build $(KATA_LDFLAGS) $(BUILDFLAGS) -o $@ -ldflags "-linkmode=external" .)
|
|
|
|
.PHONY: \
|
|
check \
|
|
--
|
|
2.27.0
|
|
|