added install.libs.R change

microsoft · Mar 24, 2020 · dfebd13 · dfebd13
1 parent ebe2d5a
commit dfebd13
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.ci/test_windows.ps1 b/.ci/test_windows.ps1
@@ -86,6 +86,12 @@ if ($env:TASK -eq "r-package"){
   tzutil /s "GMT Standard Time"
   [Void][System.IO.Directory]::CreateDirectory($env:R_LIB_PATH)
 
+  if ($env:COMPILER -eq "MINGW") {
+    Write-Output "Telling R to use MinGW"
+    $install_libs = $env:BUILD_SOURCESDIRECTORY\R-package\src\install.libs.R
+    ((Get-Content -path $install_libs -Raw) -replace 'use_mingw <- FALSE','use_mingw <- TRUE') | Set-Content -Path $install_libs
+  }
+
   # set up R if it doesn't exist yet
   if (!(Get-Command R.exe -errorAction SilentlyContinue)) {
 

diff --git a/R-package/.Rbuildignore b/R-package/.Rbuildignore
@@ -7,10 +7,8 @@
 \.o$
 \.so$
 \.dll$
-\.dylib$
 \.out$
 \.bin$
-^libs/.*$
 
 # Code copied in at build time
 ^src/CMakeLists.txt$