Skip to content

Commit

Permalink
Revert "Merge pull request #3913 from patrickbkr/fix-static-rakudo-home"
Browse files Browse the repository at this point in the history
This seems to have broken building for some reason.
No idea what's wrong yet. So revert for now.

This reverts commit c69fd17, reversing
changes made to d87eaa7.
  • Loading branch information
patrickbkr committed Sep 15, 2020
1 parent c69fd17 commit f352b6d
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 20 deletions.
12 changes: 2 additions & 10 deletions src/Perl6/SysConfig.nqp
Expand Up @@ -2,16 +2,8 @@ class Perl6::SysConfig is HLL::SysConfig {
has %!rakudo-build-config;
has $!rakudo-home;

method new(%rakudo-build-config) {
my $obj := nqp::create(self);
$obj.BUILD(%rakudo-build-config);
$obj
}

method BUILD(%rakudo-build-config) {
self.build-hll-sysconfig();

%!rakudo-build-config := %rakudo-build-config;
method BUILD() {
%!rakudo-build-config := nqp::hash();

# Determine Rakudo home.
my $execname := nqp::execname();
Expand Down
5 changes: 2 additions & 3 deletions src/main.nqp
Expand Up @@ -7,9 +7,8 @@ use Perl6::SysConfig;
# Initialize Rakudo runtime support.
nqp::p6init();

my %rakudo-build-config := nqp::hash();
hll-config(%rakudo-build-config);
nqp::bindhllsym('default', 'SysConfig', Perl6::SysConfig.new(%rakudo-build-config));
nqp::bindhllsym('default', 'SysConfig', Perl6::SysConfig.new());
hll-config(nqp::gethllsym('default', 'SysConfig').rakudo-build-config);

# Create and configure compiler object.
my $comp := Perl6::Compiler.new();
Expand Down
5 changes: 2 additions & 3 deletions src/rakudo-debug.nqp
Expand Up @@ -454,9 +454,8 @@ sub MAIN(*@ARGS) {
# Initialize dynops.
nqp::p6init();

my %rakudo-build-config := nqp::hash();
hll-config(%rakudo-build-config);
nqp::bindhllsym('default', 'SysConfig', Perl6::SysConfig.new(%rakudo-build-config));
nqp::bindhllsym('default', 'SysConfig', Perl6::SysConfig.new());
hll-config(nqp::gethllsym('default', 'SysConfig').rakudo-build-config);

# Create and configure compiler object.
my $comp := Perl6::Debugger.new();
Expand Down
5 changes: 2 additions & 3 deletions src/vm/js/load-compiler.nqp
Expand Up @@ -3,9 +3,8 @@ use Perl6::Actions;
use Perl6::Compiler;
use Perl6::SysConfig;

my %rakudo-build-config := nqp::hash();
hll-config(%rakudo-build-config);
nqp::bindhllsym('default', 'SysConfig', Perl6::SysConfig.new(%rakudo-build-config));
nqp::bindhllsym('default', 'SysConfig', Perl6::SysConfig.new());
hll-config(nqp::gethllsym('default', 'SysConfig').rakudo-build-config);

# Create and configure compiler object.
my $comp := Perl6::Compiler.new();
Expand Down
2 changes: 1 addition & 1 deletion tools/templates/NQP_REVISION
@@ -1 +1 @@
2020.08.2-18-gb28db8914
2020.08.2-15-gea2e8f080

0 comments on commit f352b6d

Please sign in to comment.