From owner-svn-src-all@freebsd.org  Sun Jun  5 23:34:20 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 409FCB6B572;
 Sun,  5 Jun 2016 23:34:20 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 12DED1953;
 Sun,  5 Jun 2016 23:34:20 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u55NYJoT035894;
 Sun, 5 Jun 2016 23:34:19 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u55NYJIe035893;
 Sun, 5 Jun 2016 23:34:19 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201606052334.u55NYJIe035893@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sun, 5 Jun 2016 23:34:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r301476 - head/usr.bin/elfcopy
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Jun 2016 23:34:20 -0000

Author: bdrewery
Date: Sun Jun  5 23:34:19 2016
New Revision: 301476
URL: https://svnweb.freebsd.org/changeset/base/301476

Log:
  Use the in-tree sys/elf_common.h
  
  This is the same fix as r301471.

Modified:
  head/usr.bin/elfcopy/Makefile

Modified: head/usr.bin/elfcopy/Makefile
==============================================================================
--- head/usr.bin/elfcopy/Makefile	Sun Jun  5 23:16:27 2016	(r301475)
+++ head/usr.bin/elfcopy/Makefile	Sun Jun  5 23:34:19 2016	(r301476)
@@ -30,4 +30,17 @@ MAN=	${PROG}.1 strip.1
 
 LINKS=	${BINDIR}/${PROG} ${BINDIR}/strip
 
+# This same hack is in lib/libelf/Makefile and usr.bin/readelf/Makefile
+# We need to link against the correct version of these files. One
+# solution is to include ../../sys in the include path. This causes
+# problems when a header file in sys depends on a file in another
+# part of the tree, e.g. a machine dependent header.
+#
+SRCS+=		sys/elf_common.h
+CLEANDIRS=	sys
+CFLAGS+=	-I.
+sys/elf_common.h: ${SRCTOP}/sys/${.TARGET} .NOMETA
+	mkdir -p ${.OBJDIR}/sys
+	ln -sf ${.ALLSRC} ${.TARGET}
+
 .include <bsd.prog.mk>