1 files changed, 11 insertions, 4 deletions
diff --git a/lib/compilers/rust.js b/lib/compilers/rust.js
index 3d3bebade..6d2295cbe 100644
--- a/lib/compilers/rust.js
+++ b/lib/compilers/rust.js
@@ -22,16 +22,23 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-var Compile = require('../base-compiler');
+var Compile = require('../base-compiler'),
+    _ = require('underscore-node');
 
 function compileRust(info, env) {
     var compiler = new Compile(info, env);
     compiler.compiler.supportsIntel = true;
-    compiler.optionsForFilter = function (filters, outputFilename) {
+    compiler.optionsForFilter = function (filters, outputFilename, userOptions) {
         var options = ['-C', 'debuginfo=1', '-o', this.filename(outputFilename)];
-        // TODO: binary not supported(?)
+        
+        var userRequestedEmit = _.any(userOptions, function(opt) {
+            return opt.indexOf("--emit") > -1;
+        });
+        //TODO: Binary not supported (?)
         if (!filters.binary) {
-            options = options.concat('--emit', 'asm');
+            if(!userRequestedEmit) {
+                options = options.concat('--emit', 'asm');
+            }
             if (filters.intel) options = options.concat('-Cllvm-args=--x86-asm-syntax=intel');
         }
         options = options.concat(['--crate-type', 'rlib']);