clearlinux/kvmtool
2
0
Fork 0
mirror of https://github.com/clearlinux/kvmtool.git synced 2026-08-19 03:47:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Makefile: allow overriding CFLAGS on the command line"

Browse Source 
Riku Voipio reports a regression introduced by d0e2772b93 ("Makefile:
allow overriding CFLAGS on the command line"):

| This breaks builds of debian packages as dpkg-buildpackage sets LDFLAGS
| to something unsuitable for guest init.

Revert the problematic patch for the moment, while we rethink how we'd
like to support user-provided toolchain flags.

This reverts commit d0e2772b93.

Conflicts:
	Makefile

Signed-off-by: Will Deacon <will.deacon@arm.com>
This commit is contained in:
Will Deacon
2015-11-04 10:45:28 +00:00
parent 03c49af7fd
commit 3ce000c5f3
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+8 -7
View File
@@ -15,7 +15,9 @@ include config/utilities.mak
include config/feature-tests.mak
CC := $(CROSS_COMPILE)gcc
CFLAGS :=
LD := $(CROSS_COMPILE)ld
LDFLAGS :=
FIND := find
CSCOPE := cscope
@@ -160,7 +162,7 @@ ifeq ($(ARCH), arm)
OBJS += arm/aarch32/kvm-cpu.o
ARCH_INCLUDE := $(HDRS_ARM_COMMON)
ARCH_INCLUDE += -Iarm/aarch32/include
override CFLAGS += -march=armv7-a
CFLAGS += -march=armv7-a
ARCH_WANT_LIBFDT := y
endif
@@ -272,12 +274,12 @@ endif
ifeq ($(LTO),1)
FLAGS_LTO := -flto
ifeq ($(call try-build,$(SOURCE_HELLO),$(CFLAGS),$(LDFLAGS) $(FLAGS_LTO)),y)
override CFLAGS += $(FLAGS_LTO)
CFLAGS += $(FLAGS_LTO)
endif
endif
ifeq ($(call try-build,$(SOURCE_STATIC),$(CFLAGS),$(LDFLAGS) -static),y)
override CFLAGS += -DCONFIG_GUEST_INIT
CFLAGS += -DCONFIG_GUEST_INIT
GUEST_INIT := guest/init
GUEST_OBJS = guest/guest_init.o
ifeq ($(ARCH_PRE_INIT),)
@@ -329,8 +331,7 @@ DEFINES += -DKVMTOOLS_VERSION='"$(KVMTOOLS_VERSION)"'
DEFINES += -DBUILD_ARCH='"$(ARCH)"'
KVM_INCLUDE := include
override CFLAGS += $(CPPFLAGS) $(DEFINES) -I$(KVM_INCLUDE) -I$(ARCH_INCLUDE)
override CFLAGS += -O2 -fno-strict-aliasing -g
CFLAGS += $(CPPFLAGS) $(DEFINES) -I$(KVM_INCLUDE) -I$(ARCH_INCLUDE) -O2 -fno-strict-aliasing -g
WARNINGS += -Wall
WARNINGS += -Wformat=2
@@ -348,10 +349,10 @@ WARNINGS += -Wvolatile-register-var
WARNINGS += -Wwrite-strings
WARNINGS += -Wno-format-nonliteral
override CFLAGS += $(WARNINGS)
CFLAGS += $(WARNINGS)
ifneq ($(WERROR),0)
override CFLAGS += -Werror
CFLAGS += -Werror
endif
all: $(PROGRAM) $(PROGRAM_ALIAS) $(GUEST_INIT) $(GUEST_PRE_INIT)