45c645b941
Update to R78-12499 OBS-URL: https://build.opensuse.org/request/show/737168 OBS-URL: https://build.opensuse.org/package/show/hardware:boot/vboot?expand=0&rev=21
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
--- Makefile.orig 2019-06-15 21:23:18.000000000 +0200
|
|
+++ Makefile 2019-06-15 21:52:33.475014820 +0200
|
|
@@ -136,7 +136,7 @@
|
|
#
|
|
# Flag ordering: arch, then -f, then -m, then -W
|
|
DEBUG_FLAGS := $(if ${DEBUG},-g -O0,-Os)
|
|
-WERROR := -Werror
|
|
+WERROR :=
|
|
FIRMWARE_FLAGS := -nostdinc -ffreestanding -fno-builtin -fno-stack-protector
|
|
COMMON_FLAGS := -pipe ${WERROR} -Wall -Wstrict-prototypes -Wtype-limits \
|
|
-Wundef -Wmissing-prototypes -Wno-trigraphs -Wredundant-decls -Wshadow \
|
|
@@ -237,12 +237,6 @@
|
|
CXX ?= g++
|
|
PKG_CONFIG ?= pkg-config
|
|
|
|
-# Static?
|
|
-ifneq (${STATIC},)
|
|
-LDFLAGS += -static
|
|
-PKG_CONFIG += --static
|
|
-endif
|
|
-
|
|
# Optional Libraries
|
|
LIBZIP_VERSION := $(shell ${PKG_CONFIG} --modversion libzip 2>/dev/null)
|
|
HAVE_LIBZIP := $(if ${LIBZIP_VERSION},1)
|
|
@@ -922,7 +916,6 @@
|
|
# Link tests for external repos
|
|
${BUILD}/host/linktest/extern: ${HOSTLIB}
|
|
${BUILD}/host/linktest/extern: LIBS = ${HOSTLIB}
|
|
-${BUILD}/host/linktest/extern: LDLIBS += -static
|
|
TEST_OBJS += ${BUILD}/host/linktest/extern.o
|
|
|
|
.PHONY: hostlib
|
|
@@ -1001,9 +994,6 @@
|
|
${UTIL_BINS} ${UTIL_BINS_STATIC}: ${UTILLIB}
|
|
${UTIL_BINS} ${UTIL_BINS_STATIC}: LIBS = ${UTILLIB}
|
|
|
|
-# Utilities for auto-update toolkits must be statically linked.
|
|
-${UTIL_BINS_STATIC}: LDFLAGS += -static
|
|
-
|
|
|
|
.PHONY: utils
|
|
utils: ${UTIL_BINS} ${UTIL_SCRIPTS}
|
|
|