Skip to content

Commit

Permalink
fix for freebsd, etc
Browse files Browse the repository at this point in the history
  • Loading branch information
timotheecour committed Jan 30, 2020
1 parent b879050 commit 7708cac
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 24 deletions.
40 changes: 20 additions & 20 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion compiler/evalffi.nim
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions koch.nim
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand All @@ -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")
Expand Down

0 comments on commit 7708cac

Please sign in to comment.