jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2010 from modk/freebsd-parallel-build

Browse source 
Fix parallel build on FreeBSD
This commit is contained in:
Andreas Rumpf 2015-02-01 01:41:26 +01:00
commit 3b45ac44e1
2 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/posix/posix.nim
View file

@ -1405,14 +1405,6 @@ var
## Report status of stopped child process.
WEXITSTATUS* {.importc, header: "<sys/wait.h>".}: cint
## Return exit status.
WIFCONTINUED* {.importc, header: "<sys/wait.h>".}: cint
## True if child has been continued.
WIFEXITED* {.importc, header: "<sys/wait.h>".}: cint
## True if child exited normally.
WIFSIGNALED* {.importc, header: "<sys/wait.h>".}: cint
## True if child exited due to uncaught signal.
WIFSTOPPED* {.importc, header: "<sys/wait.h>".}: cint
## True if child is currently stopped.
WSTOPSIG* {.importc, header: "<sys/wait.h>".}: cint
## Return signal number that caused process to stop.
WTERMSIG* {.importc, header: "<sys/wait.h>".}: cint
@ -1559,6 +1551,14 @@ var
MSG_OOB* {.importc, header: "<sys/socket.h>".}: cint
## Out-of-band data.
proc WIFCONTINUED*(s:cint) : bool {.importc, header: "<sys/wait.h>".}
## True if child has been continued.
proc WIFEXITED*(s:cint) : bool {.importc, header: "<sys/wait.h>".}
## True if child exited normally.
proc WIFSIGNALED*(s:cint) : bool {.importc, header: "<sys/wait.h>".}
## True if child exited due to uncaught signal.
proc WIFSTOPPED*(s:cint) : bool {.importc, header: "<sys/wait.h>".}
## True if child is currently stopped.
when defined(linux):
var

9
lib/pure/osproc.nim
View file

@ -848,7 +848,14 @@ elif not defined(useNimRtl):
if kill(p.id, SIGCONT) != 0'i32: raiseOsError(osLastError())
proc running(p: Process): bool =
var ret = waitpid(p.id, p.exitCode, WNOHANG)
var ret : int
when not defined(freebsd):
ret = waitpid(p.id, p.exitCode, WNOHANG)
else:
var status : cint = 1
ret = waitpid(p.id, status, WNOHANG)
if WIFEXITED(status):
p.exitCode = status
if ret == 0: return true # Can't establish status. Assume running.
result = ret == int(p.id)