diff options
| author | Dominik Picheta <dominikpicheta@gmail.com> | 2016-09-29 20:59:14 +0200 |
|---|---|---|
| committer | Dominik Picheta <dominikpicheta@gmail.com> | 2016-09-29 20:59:14 +0200 |
| commit | c035fd93f465ec2bc47645b4b838bec946ee88f0 (patch) | |
| tree | 5b23bd9f2892c57ef2cfa0e234b87c4ee29a4d7b /tools/niminst | |
| parent | d5ec9ba0998515305363351fe60bb4d875ce1997 (diff) | |
| download | Nim-c035fd93f465ec2bc47645b4b838bec946ee88f0.tar.gz | |
Works around a niminst bug. Related to commit 3813af63f5 and #4831.
Diffstat (limited to 'tools/niminst')
| -rw-r--r-- | tools/niminst/buildsh.tmpl | 1 | ||||
| -rw-r--r-- | tools/niminst/niminst.nim | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tools/niminst/buildsh.tmpl b/tools/niminst/buildsh.tmpl index 13dfe5226..220ecdb7f 100644 --- a/tools/niminst/buildsh.tmpl +++ b/tools/niminst/buildsh.tmpl @@ -92,6 +92,7 @@ case $uos in ;; *haiku* ) myos="haiku" + LINK_FLAGS="$LINK_FLAGS -lroot -lnetwork" ;; *) echo 2>&1 "Error: unknown operating system: $uos" diff --git a/tools/niminst/niminst.nim b/tools/niminst/niminst.nim index 4c8dfcddf..01efa88d4 100644 --- a/tools/niminst/niminst.nim +++ b/tools/niminst/niminst.nim @@ -447,7 +447,8 @@ proc readCFiles(c: var ConfigData, osA, cpuA: int) = # HACK: we conditionally add ``-lm -ldl``, so remove them from the # linker flags: c.linker.flags = c.linker.flags.replaceWord("-lm").replaceWord( - "-ldl").strip + "-ldl").replaceWord("-lroot").replaceWord( + "-lnetwork").strip else: if cmpIgnoreStyle(k.key, "libpath") == 0: c.libpath = k.value |