From 7708cacfe894f48e4ddbfa589071cadb62d4b891 Mon Sep 17 00:00:00 2001
From: Timothee Cour <timothee.cour2@gmail.com>
Date: Thu, 30 Jan 2020 14:02:33 -0800
Subject: [PATCH] fix for freebsd, etc

---
 azure-pipelines.yml  | 40 ++++++++++++++++++++--------------------
 compiler/evalffi.nim |  1 -
 koch.nim             |  6 +++---
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 06ee56ea16318..dccd0d05e75fc 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -5,26 +5,26 @@ jobs:
 
   strategy:
     matrix:
-      # Linux_amd64:
-      #   vmImage: 'ubuntu-16.04'
-      #   CPU: amd64
-      # Linux_i386:
-      #   vmImage: 'ubuntu-16.04'
-      #   CPU: i386
-      # OSX_amd64:
-      #   vmImage: 'macOS-10.14'
-      #   CPU: amd64
-      # OSX_amd64_cpp:
-      #   vmImage: 'macOS-10.14'
-      #   CPU: amd64
-      #   NIM_COMPILE_TO_CPP: true
-      # Windows_amd64:
-      #   vmImage: 'windows-2019'
-      #   CPU: amd64
-      # Windows_amd64_pkg:
-      #   vmImage: 'windows-2019'
-      #   CPU: amd64
-      #   NIM_TEST_PACKAGES: true
+      Linux_amd64:
+        vmImage: 'ubuntu-16.04'
+        CPU: amd64
+      Linux_i386:
+        vmImage: 'ubuntu-16.04'
+        CPU: i386
+      OSX_amd64:
+        vmImage: 'macOS-10.14'
+        CPU: amd64
+      OSX_amd64_cpp:
+        vmImage: 'macOS-10.14'
+        CPU: amd64
+        NIM_COMPILE_TO_CPP: true
+      Windows_amd64:
+        vmImage: 'windows-2019'
+        CPU: amd64
+      Windows_amd64_pkg:
+        vmImage: 'windows-2019'
+        CPU: amd64
+        NIM_TEST_PACKAGES: true
 
   pool:
     vmImage: $(vmImage)
diff --git a/compiler/evalffi.nim b/compiler/evalffi.nim
index ad5d054fae8f0..0aa8dd331fc7d 100644
--- a/compiler/evalffi.nim
+++ b/compiler/evalffi.nim
@@ -18,7 +18,6 @@ when defined(windows):
 elif defined(linux):
   const libcDll = "libc.so(.6|.5|)"
 elif defined(freebsd):
-  # const libcDll = "/usr/lib/libc.so"
   const libcDll = "/lib/libc.so.7"
 elif defined(osx):
   const libcDll = "/usr/lib/libSystem.dylib"
diff --git a/koch.nim b/koch.nim
index 1422e733071c5..c84592715252b 100644
--- a/koch.nim
+++ b/koch.nim
@@ -477,8 +477,8 @@ proc runCI(cmd: string) =
   echo "runCI:", cmd
   # note(@araq): Do not replace these commands with direct calls (eg boot())
   # as that would weaken our testing efforts.
-  # when defined(posix): # appveyor (on windows) didn't run this
-  #   kochExecFold("Boot", "boot")
+  when defined(posix): # appveyor (on windows) didn't run this
+    kochExecFold("Boot", "boot")
   # boot without -d:nimHasLibFFI to make sure this still works
   kochExecFold("Boot in release mode", "boot -d:release -d:danger")
 
@@ -497,7 +497,7 @@ proc runCI(cmd: string) =
       execFold("Compile tester", "nim c -d:nimCoroutines --os:genode -d:posix --compileOnly testament/testament")
 
     # main bottleneck here
-    # execFold("Run tester", "nim c -r -d:nimCoroutines testament/testament --pedantic all -d:nimCoroutines")
+    execFold("Run tester", "nim c -r -d:nimCoroutines testament/testament --pedantic all -d:nimCoroutines")
     block: # CT FFI
       when defined(posix): # windows can be handled in future PR's
         execFold("nimble install -y libffi", "nimble install -y libffi")