Skip to content
Permalink
Browse files

Make --no-relocatable also affect the runner rpath setting.

  • Loading branch information...
patzim committed Feb 12, 2019
1 parent 1853eb9 commit ffaf3fc3f4d8a2e6efc620b72aafb70bbf3d8da8
Showing with 3 additions and 1 deletion.
  1. +2 −0 Configure.pl
  2. +1 −1 tools/build/Makefile-Moar.in
@@ -310,6 +310,8 @@

$errors{moar}{'no gen-nqp'} = @errors && !defined $options{'gen-nqp'};

$config{ldrpath} = $options{'no-relocatable'} ? $nqp_config{'moar::ldrpath'} : $nqp_config{'moar::ldrpath_relocatable'};

if ($win) {
if ($prefix . $slash . 'bin' ne $nqp_config{'moar::libdir'}) {
$config{'m_install'} = "\t" . '$(CP) ' . $nqp_config{'moar::libdir'} . $slash . $nqp_config{'moar::moar'} . ' $(PREFIX)' . $slash . 'bin';
@@ -2,7 +2,7 @@ M_CC = @moar::cc@
M_LD = @moar::ld@
M_CFLAGS = @moar::cflags@ @moar::ccmiscflags@ @moar::ccoptiflags@ @moar::ccwarnflags@
M_LDFLAGS = @moar::ldflags@ @moar::ldmiscflags@ @moar::ldoptiflags@ @moar::ldlibs@
M_LDRPATH = @moar::ldrpath@
M_LDRPATH = @ldrpath@
M_C_RUNNER_LIBS = @c_runner_libs@
M_MINGW_UNICODE = @mingw_unicode@

0 comments on commit ffaf3fc

Please sign in to comment.
You can’t perform that action at this time.