From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paolo Bonzini Subject: [PATCH kvm-unit-tests] remove kerneldir Date: Thu, 14 Jul 2016 11:49:47 +0200 Message-ID: <1468489787-14130-1-git-send-email-pbonzini@redhat.com> To: kvm@vger.kernel.org Return-path: Received: from mail-wm0-f65.google.com ([74.125.82.65]:34667 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750958AbcGNJtw (ORCPT ); Thu, 14 Jul 2016 05:49:52 -0400 Received: by mail-wm0-f65.google.com with SMTP id q128so4369469wma.1 for ; Thu, 14 Jul 2016 02:49:51 -0700 (PDT) Received: from 640k.lan (94-39-188-118.adsl-ull.clienti.tiscali.it. [94.39.188.118]) by smtp.gmail.com with ESMTPSA id r67sm2105393wmb.14.2016.07.14.02.49.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Jul 2016 02:49:49 -0700 (PDT) Sender: kvm-owner@vger.kernel.org List-ID: kvm-unit-tests is independent of the kernel source code, do not add it to the include path. This fixes i386 compilation. Signed-off-by: Paolo Bonzini --- configure | 6 ------ x86/Makefile.i386 | 1 - 2 files changed, 7 deletions(-) diff --git a/configure b/configure index ca0ef83..995c8fa 100755 --- a/configure +++ b/configure @@ -1,7 +1,6 @@ #!/bin/bash prefix=/usr/local -kerneldir=/lib/modules/$(uname -r)/build cc=gcc ld=ld objcopy=objcopy @@ -25,7 +24,6 @@ usage() { --cc=CC c compiler to use ($cc) --ld=LD ld linker to use ($ld) --prefix=PREFIX where to install things ($prefix) - --kerneldir=DIR kernel build directory for kvm.h ($kerneldir) --endian=ENDIAN endianness to compile for (little or big, ppc64 only) --[enable|disable]-pretty-print-stacks enable or disable pretty stack printing (enabled by default) @@ -44,9 +42,6 @@ while [[ "$1" = -* ]]; do --prefix) prefix="$arg" ;; - --kerneldir) - kerneldir="$arg" - ;; --arch) arch="$arg" ;; @@ -145,7 +140,6 @@ ln -s $asm lib/asm # create the config cat < config.mak PREFIX=$prefix -KERNELDIR=$(readlink -f $kerneldir) HOST=$host ARCH=$arch ARCH_NAME=$arch_name diff --git a/x86/Makefile.i386 b/x86/Makefile.i386 index c4176c4..284b9e5 100644 --- a/x86/Makefile.i386 +++ b/x86/Makefile.i386 @@ -1,7 +1,6 @@ cstart.o = $(TEST_DIR)/cstart.o bits = 32 ldarch = elf32-i386 -CFLAGS += -I $(KERNELDIR)/include cflatobjs += lib/x86/setjmp32.o -- 1.8.3.1