Fix build on R-3.6 on Windows

jeroen · Oct 6, 2024 · 1834929 · 1834929
1 parent 2aa4237
commit 1834929
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -19,6 +19,7 @@ jobs:
           - {os: macOS-13,   r: 'release'}
           - {os: macOS-14,   r: 'release'}
           - {os: macOS-latest,   r: 'release', disable-static: 'disable-static'}
+          - {os: windows-latest, r: '3.6'}
           - {os: windows-latest, r: '4.0'}
           - {os: windows-latest, r: '4.1'}
           - {os: windows-latest, r: '4.2'}

diff --git a/src/bindings.cpp b/src/bindings.cpp
@@ -113,8 +113,10 @@ static v8::MaybeLocal<v8::Promise> ResolveDynamicModuleCallback(
 #if V8_VERSION_TOTAL >= 908
     v8::Local<v8::Data> host_defined_options,
     v8::Local<v8::Value> resource_name,
-#else
+#elif V8_VERSION_TOTAL >= 603
     v8::Local<v8::ScriptOrModule> referrer,
+#else
+    v8::Local<v8::String> referrer,
 #endif
     v8::Local<v8::String> specifier
     FixedArrayParam

diff --git a/tools/legacy.win b/tools/legacy.win
@@ -1,7 +1,7 @@
 VERSION = 6.2.414.50-vista
 CXX_STD = CXX11
 RWINLIB =../windows/libv8-$(VERSION)
-PKG_CPPFLAGS = -I$(RWINLIB)/include -DV8_ENABLE_CHECKS
+PKG_CPPFLAGS = -I$(RWINLIB)/include -DV8_ENABLE_CHECKS -DISNODEJS=6.2
 PKG_LIBS = \
 	-L$(RWINLIB)/lib${subst gcc ,-,${R_COMPILED_BY}}${R_ARCH} \
 	-L$(RWINLIB)/lib${R_ARCH} \