scripts: Support yasm

And document it in the README.

2 files changed, 20 insertions, 1 deletions

diff --git a/README b/README.md
index 3be18b8..2aac309 100644
--- a/README
+++ b/README.md
@@ -1,3 +1,6 @@
+Dolt
+----
+
 Dolt provides a drop-in replacement for libtool that significantly decreases
 compile times on the platforms it supports. Rather than the libtool approach
 of running a large script for every compile that repeatedly figures out how
@@ -5,6 +8,10 @@ to build libraries on the platform, dolt figures out those details at
 configure time and writes out a minimal doltcompile script containing only the
 commands needed to build a library on the current platform.
 
+
+Usage
+-----
+
 If you use automake, autoconf, and libtool, then using dolt just requires two
 steps:
 
@@ -14,3 +21,8 @@ steps:
 - Add DISTCLEANFILES = @DOLT_CLEANFILES@ to your Makefile.am
 For any platform Dolt does not support, it will transparently fall back to
 libtool.
+
+Additional features
+-------------------
+
+- Experimental yasm support.
diff --git a/dolt.m4 b/dolt.m4
index 493ac85..ff28bef 100644
--- a/dolt.m4
+++ b/dolt.m4
@@ -73,7 +73,13 @@ pic_object="$libobjdir/$objbase.o"
 args@<:@$objarg@:>@="$pic_object"
 __DOLTCOMPILE__EOF__
     cat <<__DOLTCOMPILE__EOF__ >>doltcompile
-"\${args@<:@@@:>@}" $pic_options -DPIC || exit \$?
+    pic_options="$pic_options"
+    if test x\$passthrough = xtrue; then
+        pic_options=""
+    fi
+__DOLTCOMPILE__EOF__
+    cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+${args@<:@@@:>@} $pic_options -DPIC || exit $?
 __DOLTCOMPILE__EOF__
     fi
 
@@ -149,6 +155,7 @@ for arg in "$[]@"; do
     case "$arg" in
         --mode=compile) modeok=true ;;
         --tag=CC|--tag=CXX) tagok=true ;;
+        --tag=ASM|--tag=YASM) tagok=true; passthrough=true;;
         --silent|--quiet) ;;
         *) args@<:@${#args[@]}@:>@="$arg" ;;
     esac