Merge branch 'issue-548' of https://github.com/ekskimn/libsass into i…

…ssue-548 * 'issue-548' of https://github.com/ekskimn/libsass: sass#548 squashed commit
ekskimn · Mar 18, 2015 · 47ecb0d · 47ecb0d
2 parents a14c87b + 717c3ed
commit 47ecb0d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -15,6 +15,7 @@ environment:
     ruby_version: "21-x64"
 
 cache:
+  - C:\mingw64
   - C:\Ruby%ruby_version%\lib\ruby\gems
 
 install:
@@ -63,7 +64,7 @@ test_script:
         ruby sass-spec\sass-spec.rb -c sassc\bin\sassc.exe -s --ignore-todo sass-spec/spec
       } else {
         if ($env:Config -eq "Debug") {
-          echo "test runner in debug mode build via msvc will throw debug assertions"
+          echo test runner in debug mode build via msvc will throw debug assertions
           echo ruby sass-spec\sass-spec.rb -c win\bin\Debug\sassc.exe -s --ignore-todo sass-spec/spec
         } else {
           ruby sass-spec\sass-spec.rb -c win\bin\sassc.exe -s --ignore-todo sass-spec/spec

diff --git a/context.cpp b/context.cpp
@@ -113,7 +113,7 @@ namespace Sass {
       }
     }
 
-    emitter.set_filename(resolve_relative_path(output_path, source_map_file, cwd));
+    emitter.set_filename(output_path);
 
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -113,7 +113,7 @@ namespace Sass { @@
           }
         }
-        emitter.set_filename(resolve_relative_path(output_path, source_map_file, cwd));
+        emitter.set_filename(output_path);
       }
@@ Expand Down @@