github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-15 22:53:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2479 from jcvenegas/fix-2478

Browse Source 
makefile: do not use LDFLAGS for extra kata flags.
This commit is contained in:
Salvador Fuentes 2020-02-19 12:15:53 -06:00 committed by GitHub
commit 2c0e8ff499
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -465,7 +465,7 @@ BUILDFLAGS := -buildmode=pie
# whether stipping the binary
ifeq ($(STRIP),yes)
LDFLAGS := -ldflags "-w -s"
KATA_LDFLAGS := -ldflags "-w -s"
endif
# Return non-empty string if specified directory exists
@ -495,7 +495,7 @@ containerd-shim-v2: $(SHIMV2_OUTPUT)
netmon: $(NETMON_TARGET_OUTPUT)
$(NETMON_TARGET_OUTPUT): $(SOURCES) VERSION
$(QUIET_BUILD)(cd $(NETMON_DIR) && go build $(BUILDFLAGS) -o $@ -ldflags "-X main.version=$(VERSION)" $(LDFLAGS))
$(QUIET_BUILD)(cd $(NETMON_DIR) && go build $(BUILDFLAGS) -o $@ -ldflags "-X main.version=$(VERSION)" $(KATA_LDFLAGS))
runtime: $(TARGET_OUTPUT) $(CONFIGS)
.DEFAULT: default