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

Works around a niminst bug. Related to commit 3813af63f5 and #4831.

Browse source
This commit is contained in:
Dominik Picheta 2016-09-29 20:59:14 +02:00
commit c035fd93f4
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tools/niminst/buildsh.tmpl
View file

@ -92,6 +92,7 @@ case $uos in
;; ;;
*haiku* ) *haiku* )
myos="haiku" myos="haiku"
LINK_FLAGS="$LINK_FLAGS -lroot -lnetwork"
;; ;;
*) *)
echo 2>&1 "Error: unknown operating system: $uos" echo 2>&1 "Error: unknown operating system: $uos"

3
tools/niminst/niminst.nim
View file

@ -447,7 +447,8 @@ proc readCFiles(c: var ConfigData, osA, cpuA: int) =
# HACK: we conditionally add ``-lm -ldl``, so remove them from the # HACK: we conditionally add ``-lm -ldl``, so remove them from the
# linker flags: # linker flags:
c.linker.flags = c.linker.flags.replaceWord("-lm").replaceWord( c.linker.flags = c.linker.flags.replaceWord("-lm").replaceWord(
"-ldl").strip "-ldl").replaceWord("-lroot").replaceWord(
"-lnetwork").strip
else: else:
if cmpIgnoreStyle(k.key, "libpath") == 0: if cmpIgnoreStyle(k.key, "libpath") == 0:
c.libpath = k.value c.libpath = k.value