From: Hoa Nguyen <hoanguyen@ucdavis.edu>
Date: Wed, 2 Sep 2020 00:36:55 +0000 (-0700)
Subject: ext: Link gem5 libelf to ext/libelf/libelf.a
X-Git-Tag: v20.1.0.0~157
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d2fb5c047f400d87f308d1c6c3f73ef8adcd9ec4;p=gem5.git

ext: Link gem5 libelf to ext/libelf/libelf.a

Currently, gem5 might use system's libelf library instead of
the one compiled from ext/libelf.
This commit tells scons to use ext/libelf version.

JIRA: https://gem5.atlassian.net/browse/GEM5-756

Signed-off-by: Hoa Nguyen <hoanguyen@ucdavis.edu>
Change-Id: I8dc4555c32a956e9f5249288c71982fa6a3678f7
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/33941
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/ext/libelf/SConscript b/ext/libelf/SConscript
index 45f809da9..3bf5b3063 100644
--- a/ext/libelf/SConscript
+++ b/ext/libelf/SConscript
@@ -134,6 +134,6 @@ m4env.M4(target=File('libelf_msize.c'),
 m4env.Library('elf', [m4env.SharedObject(f) for f in elf_files])
 
 main.Prepend(CPPPATH=Dir('.'))
-main.Append(LIBS=['elf'])
+main.Append(LIBS=[File('libelf.a')])
 main.Prepend(LIBPATH=[Dir('.')])