[JVM] Make sure $J_LIBPATH is actually set

For the JVM backend %nqp_config is not passed to fill_template_file, so we cannot use nqp::libdir directly.
rakudo · Dec 31, 2016 · 7bba13a · 7bba13a
1 parent b3ab375
commit 7bba13a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Configure.pl b/Configure.pl
@@ -257,6 +257,7 @@
             $config{'nqp_jars'}      = $nqp_config{'jvm::runtime.jars'};
             $config{'bld_nqp_jars'}  = join( $config{'cpsep'}, map { $config{'sysroot'} . $_ } split( $config{'cpsep'}, $nqp_config{'jvm::runtime.jars'} ) );
             $config{'nqp_classpath'} = $nqp_config{'jvm::runtime.classpath'};
+            $config{'nqp_libdir'}    = $nqp_config{'nqp::libdir'};
             $config{'j_runner'}      = $win ? 'perl6-j.bat' : 'perl6-j';
 
 

diff --git a/tools/build/Makefile-JVM.in b/tools/build/Makefile-JVM.in
@@ -8,7 +8,7 @@ NQP_PREFIX = @nqp_prefix@
 
 J_BUILD_DIR = gen/jvm
 
-J_LIBPATH = @nqp::libdir@
+J_LIBPATH = @nqp_libdir@
 
 NQP_JARS = @nqp_jars@
 BLD_NQP_JARS = @bld_nqp_jars@