build v8 for muti-version lib.js on macOS

jackllh · Jun 1, 2018 · 6b0988f · 6b0988f
1 parent 01d3aef
commit 6b0988f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/nf/nvm/module.go b/nf/nvm/module.go
@@ -34,7 +34,7 @@ import (
 // const
 const (
 	JSLibRootName    = "lib/"
-	JSLibRootNameLen = len(JSLibRoot)
+	JSLibRootNameLen = 4
 )
 
 var (

diff --git a/nf/nvm/native-lib/libnebulasv8.dylib b/nf/nvm/native-lib/libnebulasv8.dylib
diff --git a/nf/nvm/v8/lib/execution_env.cc b/nf/nvm/v8/lib/execution_env.cc
@@ -21,6 +21,7 @@
 #include "../engine.h"
 #include "file.h"
 #include "logger.h"
+#include "global.h"
 
 static AttachLibVersionDelegate alvDelegate = NULL;
 
@@ -72,4 +73,4 @@ int SetupExecutionEnv(Isolate *isolate, Local<Context> &context) {
 
 void InitializeExecutionEnvDelegate(AttachLibVersionDelegate aDelegate) {
   alvDelegate = aDelegate;
-}
+}
diff --git a/nf/nvm/v8/lib/require_callback.cc b/nf/nvm/v8/lib/require_callback.cc
@@ -122,7 +122,7 @@ void RequireCallback(const v8::FunctionCallbackInfo<v8::Value> &info) {
   char *abPath = NULL;
   if (strcmp(*filename, LIB_WHITE)) { // if needed, check array instead.
     char versioned[MAX_VERSIONED_PATH_LEN] = {0};
-    if (attachVersion(versioned, context, filename) != 0) {
+    if (attachVersion(versioned, context, *filename) != 0) {
       isolate->ThrowException(Exception::Error(String::NewFromUtf8(
           isolate, "attach version failed")));
       return;