Merge pull request #183 from usev6/master

Fix parrot build problem on NetBSD (building of dyncall failed)
Raku · Sep 19, 2014 · 4c831a3 · 4c831a3
2 parents 1f0d522 + 008f60c
commit 4c831a3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/3rdparty/dyncall/configure b/3rdparty/dyncall/configure
@@ -47,7 +47,13 @@ case ${TARGET:=`uname`} in
     fi
     printf "LDFLAGS=-lm -ldl\n" >>$C
     ;;
-  OpenBSD|NetBSD)
+  OpenBSD)
+    printf "LDFLAGS=-lm\n" >>$C
+    ;;
+  NetBSD)
+    if [ -z "${CFLAGS}" ]; then
+      printf "CFLAGS=-fPIC\n" >>$C
+    fi
     printf "LDFLAGS=-lm\n" >>$C
     ;;
   FreeBSD)

diff --git a/Configure.pl b/Configure.pl
@@ -179,12 +179,7 @@
                 $config{'dyncall_build'} = "cd 3rdparty/dyncall && $make BUILD_DIR=. -f Makefile.embedded mingw32";
             } else {
                 system_or_die('cd 3rdparty/dyncall && sh configure');
-
-                if ($^O eq 'netbsd') {
-                    $config{'dyncall_build'} = "cd 3rdparty/dyncall && BUILD_DIR=. $make -f BSDmakefile";
-                } else {
-                    $config{'dyncall_build'} = "cd 3rdparty/dyncall && BUILD_DIR=. $make";
-                }
+                $config{'dyncall_build'} = "cd 3rdparty/dyncall && BUILD_DIR=. $make";
             }
         }