Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions pkg/glj/init-aot.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//go:build !glj_no_aot_stdlib

package glj

import (
// Add NS loaders for the standard library.
_ "github.com/glojurelang/glojure/pkg/stdlib/glojure/core"
_ "github.com/glojurelang/glojure/pkg/stdlib/glojure/core/async"
_ "github.com/glojurelang/glojure/pkg/stdlib/glojure/go/io"
_ "github.com/glojurelang/glojure/pkg/stdlib/glojure/protocols"
)
6 changes: 0 additions & 6 deletions pkg/glj/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@ import (
_ "github.com/glojurelang/glojure/pkg/gen/gljimports"
"github.com/glojurelang/glojure/pkg/lang"

// Add NS loaders for the standard library.
_ "github.com/glojurelang/glojure/pkg/stdlib/glojure/core"
_ "github.com/glojurelang/glojure/pkg/stdlib/glojure/core/async"
_ "github.com/glojurelang/glojure/pkg/stdlib/glojure/go/io"
_ "github.com/glojurelang/glojure/pkg/stdlib/glojure/protocols"

"github.com/glojurelang/glojure/pkg/runtime"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/runtime/envinit.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ func NewEnvironment(opts ...EvalOption) lang.Environment {
// Workaround to ensure namespaces that are required by core are loaded.
// TODO: AOT should identify this dependency and generate code to load it.
if useAot {
RT.Load("glojure/core/protocols")
RT.Load("glojure/protocols")
RT.Load("glojure/string")
RT.Load("glojure/go/io")
}
Expand Down