--- a/mkoctfile.in
+++ b/mkoctfile.in
@@ -48,6 +48,7 @@
 ldflags=
 dbg=:
 strip=false
+link=true
 
 if [ $# -eq 0 ]; then
   echo $usage_msg
@@ -92,6 +93,8 @@
 
   -LDIR                   Add -LDIR to link command.
 
+  -c                      Compile, but do not link.
+
   -o FILE, --output FILE  Output file name.  Default extension is .oct.
 
   -p VAR, --print VAR     Print configuration variable VAR.  Recognized
@@ -153,6 +156,9 @@
     -s | --strip)
       strip=true
     ;;
+    -c)
+      link=false
+    ;;
     *)
       echo "mkoctfile: unrecognized argument $1"
       exit 1
@@ -231,8 +237,9 @@
 
 # Link all the object files.
 
-$dbg $SH_LD $SH_LDFLAGS -o $octfile $objfiles $ldflags
-eval $SH_LD $SH_LDFLAGS -o $octfile $objfiles $ldflags
+if $link; then
+  $dbg $SH_LD $SH_LDFLAGS -o $octfile $objfiles $ldflags
+  eval $SH_LD $SH_LDFLAGS -o $octfile $objfiles $ldflags
 
 # Maybe strip it.
 
@@ -240,5 +247,6 @@
   $dbg strip $octfile
   eval strip $octfile
 fi
+fi
 
 exit 0