util: Link m5_mmap into the JNI shared library for the m5 util.
authorGabe Black <gabe.black@gmail.com>
Fri, 23 Oct 2020 03:00:53 +0000 (20:00 -0700)
committerGabe Black <gabe.black@gmail.com>
Fri, 4 Dec 2020 11:14:15 +0000 (11:14 +0000)
Change-Id: I6849a547e9150417a09f7a0efc73ebf032e44f3a
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/28174
Reviewed-by: Gabe Black <gabe.black@gmail.com>
Reviewed-by: Pouya Fotouhi <pfotouhi@ucdavis.edu>
Maintainer: Gabe Black <gabe.black@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
util/m5/src/SConscript

index 0f47494386e126b1b165e8033bd34f3ba9f2c627..395abb921707124e84cddc534af3c9210366f5e7 100644 (file)
@@ -112,7 +112,8 @@ if env['HAVE_JAVA']:
                      OUT=Dir('out'), CWD=Dir('.'))
     # Set include paths to the C headers from the JDK which scons found for us.
     java_env.Append(CPPPATH='${JAVAINCLUDES}')
-    java_env.SharedLibrary('out/gem5OpJni', [ jni ] + m5op_shared)
+    java_env.SharedLibrary('out/gem5OpJni',
+                           [ jni ] + m5op_shared + m5_mmap_shared)
 
 
 if env['HAVE_LUA51']: