summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAndreas Rumpf <rumpf_a@web.de>2015-01-12 16:49:29 +0100
committerAndreas Rumpf <rumpf_a@web.de>2015-01-12 16:49:29 +0100
commit8bdb7fa408b20bc45c15d2ffb02b6a618863d329 (patch)
tree36d5b5e9911f21ba1bca7176c7e219f9744dde58
parentb9079b87134864a478ac453fd31363e6d8d86794 (diff)
parent342608db0c65191251da75020eba42afd30d6c70 (diff)
downloadNim-8bdb7fa408b20bc45c15d2ffb02b6a618863d329.tar.gz
Merge pull request #1936 from sa2ajj/freebsd-compiler
make FreeBSD's compiler clang
-rw-r--r--config/nim.cfg2
-rw-r--r--tools/niminst/buildsh.tmpl8
2 files changed, 8 insertions, 2 deletions
diff --git a/config/nim.cfg b/config/nim.cfg
index 018e21b17..54c77e573 100644
--- a/config/nim.cfg
+++ b/config/nim.cfg
@@ -100,7 +100,7 @@ hint[LineTooLong]=off
   @end
 @end
 
-@if macosx:
+@if macosx or freebsd:
   cc = clang
   tlsEmulation:on
   gcc.options.always = "-w -fasm-blocks"
diff --git a/tools/niminst/buildsh.tmpl b/tools/niminst/buildsh.tmpl
index 4966af07a..d9508f515 100644
--- a/tools/niminst/buildsh.tmpl
+++ b/tools/niminst/buildsh.tmpl
@@ -54,10 +54,16 @@ case $uos in
     myos="linux" 
     LINK_FLAGS="$LINK_FLAGS -ldl -lm"
     ;;
-  *freebsd* | *dragonfly* ) 
+  *dragonfly* )
     myos="freebsd"
     LINK_FLAGS="$LINK_FLAGS -lm"
     ;;
+  *freebsd* )
+    myos="freebsd"
+    CC="clang"
+    LINKER="clang"
+    LINK_FLAGS="$LINK_FLAGS -ldl -lm"
+    ;;
   *openbsd* )
     myos="openbsd" 
     LINK_FLAGS="$LINK_FLAGS -lm"