sassc 2.0.1 → 2.1.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e6cc1e890efb61b8b1a8f6668f8630f29c2e1b82a1f40a3b4565ce2dca663ae
-  data.tar.gz: 966753477021819b719c5f214429f72fdb1011fe7c573e6211d26cbc038c51a8
+  metadata.gz: ff2772176f5c2bacf4de7b0834cbf272937b6116fa74fb17a17f29d9724b88f7
+  data.tar.gz: bb3876936e8d92ba560939f5e26b2c164d6c979dd346a4c49bebab568f3c8fde
 SHA512:
-  metadata.gz: 65a6849e533cecd8634a556fe4f55fb21a6b8fe3763685a9fd10199dc900c4ae41f52a950301757842a513aab8e3da08901f7a25953db673f4f3c72baa57ed68
-  data.tar.gz: 85c9a25f4f05d5d41fa7ace63b1917be6987adaf41e61c77f57f0336f81c164524b9b29ebe194e14afb745a5e89bea9f1bd1bac799a4cc3f7a8befd684d55b9b
+  metadata.gz: 22d29a7b4470fcaf270a7c0c9a8abda0ada4242ca1d62f2c6c096a3119b3178369c8b4a168395f2cdf80498630b6f7e6d21eaa32048db01fd7fa31d134292368
+  data.tar.gz: '080d0c1eb2a7545a7f4762963e2ca0b6edd8b271c0aeb8d238afc92a90d03f8db0f43e569fc22e9eb8b957447184b88f7df673157e8ad3d448ba6857494bf639'

data/.gitignore

@@ -12,5 +12,6 @@
 *.so
 *.o
 *.a
+*.gem
 mkmf.log
 vendor/bundle

data/.gitmodules

@@ -1,3 +1,3 @@
 [submodule "ext/libsass"]
 	path = ext/libsass
-  url = git://github.com/sass/libsass.git
+	url = https://github.com/sass/libsass.git

data/.travis.yml

@@ -3,8 +3,12 @@ language: ruby
 bundler_args: "--binstubs --standalone --without documentation --path ../bundle"
 script: "bundle exec rake test"
 rvm:
-  - 2.3.7
-  - 2.4.4
-  - 2.5.1
+  - 2.0.0
+  - 2.1.10
+  - 2.2.10
+  - 2.3.8
+  - 2.4.6
+  - 2.5.5
+  - 2.6.3
 notifications:
   email: false

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+- **2.1.0.pre1**
+  - [Update Libsass to 3.6.0](https://github.com/sass/sassc-ruby/pull/96/files)
+  - [Support old Ruby versions](https://github.com/sass/sassc-ruby/pull/117/files)
 - **2.0.1**
   - [Relax FFI dependency](https://github.com/sass/sassc-ruby/pull/102)
 - **2.0.0**

data/CODE_OF_CONDUCT.md

@@ -7,4 +7,4 @@ fair place to play.
 
 [The full community guidelines can be found on the Sass website.][link]
 
-[link]: http://sass-lang.com/community-guidelines
+[link]: https://sass-lang.com/community-guidelines

data/README.md

@@ -6,7 +6,7 @@ This gem combines the speed of `libsass`, the [Sass C implementation](https://gi
 
 ### libsass Version
 
-[3.5.2](https://github.com/sass/libsass/releases/tag/3.5.2)
+[3.6.0](https://github.com/sass/libsass/releases/3.6.0)
 
 ## Installation
 

data/Rakefile

@@ -1,15 +1,30 @@
-begin
-  require 'bundler/gem_tasks'
-rescue LoadError
-  puts 'Cannot load bundler/gem_tasks'
-end
-
-require 'tasks/libsass'
+require 'bundler/gem_tasks'
 
 task default: :test
 
+require 'rake/extensiontask'
+gem_spec = Gem::Specification.load("sassc.gemspec")
+Rake::ExtensionTask.new('libsass', gem_spec) do |ext|
+  ext.name = 'libsass'
+  ext.ext_dir = 'ext'
+  ext.lib_dir = 'lib/sassc'
+  ext.cross_compile = true
+  ext.cross_platform = %w[x86-mingw32 x64-mingw32 x86-linux x86_64-linux]
+  ext.cross_compiling do |spec|
+    spec.files.reject! { |path| File.fnmatch?('ext/*', path) }
+  end
+end
+
+desc 'Compile all native gems via rake-compiler-dock (Docker)'
+task 'gem:native' do
+  require 'rake_compiler_dock'
+  RakeCompilerDock.sh "bundle && gem i rake --no-document && "\
+                      "rake cross native gem MAKE='nice make -j`nproc`' "\
+                      "RUBY_CC_VERSION=2.6.0:2.5.0:2.4.0:2.3.0"
+end
+
 desc "Run all tests"
-task test: 'libsass:compile' do
+task test: 'compile:libsass' do
   $LOAD_PATH.unshift('lib', 'test')
   Dir.glob('./test/**/*_test.rb') { |f| require f }
 end

data/ext/extconf.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+gem_root = File.expand_path('..', __dir__)
+libsass_dir = File.join(gem_root, 'ext', 'libsass')
+
+if !File.directory?(libsass_dir) ||
+   # '.', '..', and possibly '.git' from a failed checkout:
+   Dir.entries(libsass_dir).size <= 3
+  Dir.chdir(gem_root) { system('git submodule update --init') } or
+    fail 'Could not fetch libsass'
+end
+
+# Only needed because rake-compiler expects `.bundle` on macOS:
+# https://github.com/rake-compiler/rake-compiler/blob/9f15620e7db145d11ae2fc4ba032367903f625e3/features/support/platform_extension_helpers.rb#L5
+dl_ext = (RUBY_PLATFORM =~ /darwin/ ? 'bundle' : 'so')
+
+File.write 'Makefile', <<-MAKEFILE
+ifndef DESTDIR
+	LIBSASS_OUT = #{gem_root}/lib/sassc/libsass.#{dl_ext}
+else
+	LIBSASS_OUT = $(DESTDIR)$(PREFIX)/libsass.#{dl_ext}
+endif
+
+SUB_DIR := #{libsass_dir}
+
+libsass.#{dl_ext}:#{' clean' if ENV['CLEAN']}
+	$(MAKE) -C '$(SUB_DIR)' lib/libsass.so
+	cp '$(SUB_DIR)/lib/libsass.so' libsass.#{dl_ext}
+	strip -x libsass.#{dl_ext}
+
+install: libsass.#{dl_ext}
+	cp libsass.#{dl_ext} '$(LIBSASS_OUT)'
+
+clean:
+	$(MAKE) -C '$(SUB_DIR)' clean
+	rm -f '$(LIBSASS_OUT)' libsass.#{dl_ext}
+
+.PHONY: clean install
+MAKEFILE

data/ext/libsass/.gitignore

@@ -2,6 +2,7 @@
 
 /sassc
 /sass-spec
+/plugins/
 
 VERSION
 .DS_Store

data/ext/libsass/GNUmakefile.am

@@ -18,70 +18,54 @@ AM_LDFLAGS  = $(AM_COPT) $(AM_COVLDFLAGS)
 AM_CPPFLAGS += -I$(top_srcdir)
 
 RESOURCES =
+AM_CXXFLAGS += -std=c++11
 if COMPILER_IS_MINGW32
   RESOURCES += res/libsass.rc
-  AM_CXXFLAGS += -std=gnu++0x
-else
-  AM_CXXFLAGS += -std=c++0x
 endif
 
+TEST_EXTENSIONS = .rb
+
 if ENABLE_TESTS
 
-noinst_PROGRAMS = tester
+SASS_SASSC_PATH ?= $(top_srcdir)/sassc
+SASS_SPEC_PATH ?= $(top_srcdir)/sass-spec
 
+noinst_PROGRAMS = tester
 tester_LDADD = src/libsass.la
-tester_SOURCES = $(SASS_SASSC_PATH)/sassc.c
-tester_VERSION ?= `cd "$(SASS_SASSC_PATH)" && ./version.sh`
-tester_CFLAGS = $(AM_CFLAGS) -DSASSC_VERSION="\"$(tester_VERSION)\""
-tester_CXXFLAGS = $(AM_CXXFLAGS) -DSASSC_VERSION="\"$(tester_VERSION)\""
 tester_LDFLAGS = $(AM_LDFLAGS)
+nodist_tester_SOURCES = $(SASS_SASSC_PATH)/sassc.c
+SASS_SASSC_VERSION ?= `cd "$(SASS_SASSC_PATH)" && ./version.sh`
+tester_CFLAGS = $(AM_CFLAGS) -DSASSC_VERSION="\"$(SASS_SASSC_VERSION)\""
+tester_CXXFLAGS = $(AM_CXXFLAGS) -DSASSC_VERSION="\"$(SASS_SASSC_VERSION)\""
 
 if ENABLE_COVERAGE
 nodist_EXTRA_tester_SOURCES = non-existent-file-to-force-CXX-linking.cxx
 endif
 
-SASS_SASSC_PATH ?= $(top_srcdir)/sassc
-SASS_SPEC_PATH ?= $(top_srcdir)/sass-spec
+TESTS = $(SASS_SPEC_PATH)/sass-spec.rb
+RB_LOG_COMPILER = ./script/tap-runner
+AM_RB_LOG_FLAGS = $(RUBY)
 
-TESTS = \
-	$(SASS_SPEC_PATH)/spec/basic \
-	$(SASS_SPEC_PATH)/spec/css \
-	$(SASS_SPEC_PATH)/spec/extend-tests \
-	$(SASS_SPEC_PATH)/spec/extends \
-	$(SASS_SPEC_PATH)/spec/libsass \
-	$(SASS_SPEC_PATH)/spec/libsass-closed-issues \
-	$(SASS_SPEC_PATH)/spec/maps \
-	$(SASS_SPEC_PATH)/spec/misc \
-	$(SASS_SPEC_PATH)/spec/regressions \
-	$(SASS_SPEC_PATH)/spec/scss \
-	$(SASS_SPEC_PATH)/spec/scss-tests \
-	$(SASS_SPEC_PATH)/spec/types
-
-SASS_TEST_FLAGS = -V 3.5 --impl libsass
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) ./script/tap-driver
-AM_LOG_FLAGS = -c ./tester $(LOG_FLAGS)
-if USE_TAP
-	AM_LOG_FLAGS += -t
-	SASS_TEST_FLAGS += -t | tapout
-	LOG_COMPILER = ./script/tap-runner $(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb
-else
-	LOG_COMPILER = $(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb
-endif
+SASS_TEST_FLAGS = --impl libsass
+SASS_TEST_FLAGS += -r $(SASS_SPEC_PATH)
+SASS_TEST_FLAGS += -c $(top_srcdir)/tester$(EXEEXT)
+AM_TESTS_ENVIRONMENT = TEST_FLAGS='$(SASS_TEST_FLAGS)'
 
 SASS_TESTER = $(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb
-SASS_TESTER += -c $(top_srcdir)/tester$(EXEEXT)
 
 test:
-	$(SASS_TESTER) $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
+	$(SASS_TESTER) $(SASS_TEST_FLAGS)
 
 test_build:
-	$(SASS_TESTER) $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
+	$(SASS_TESTER) $(SASS_TEST_FLAGS)
 
 test_full:
-	$(SASS_TESTER) --run-todo $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
+	$(SASS_TESTER) --run-todo $(SASS_TEST_FLAGS)
 
 test_probe:
-	$(SASS_TESTER) --probe-todo $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
+	$(SASS_TESTER) --probe-todo $(SASS_TEST_FLAGS)
+
+.PHONY: test test_build test_full test_probe
 
 endif
 

data/ext/libsass/Makefile

@@ -1,6 +1,6 @@
 OS       ?= $(shell uname -s)
-CC       ?= gcc
-CXX      ?= g++
+CC       ?= cc
+CXX      ?= c++
 RM       ?= rm -f
 CP       ?= cp -a
 MKDIR    ?= mkdir
@@ -15,7 +15,7 @@ INSTALL  ?= install
 CFLAGS   ?= -Wall
 CXXFLAGS ?= -Wall
 LDFLAGS  ?= -Wall
-ifeq "x$(COVERAGE)" "x"
+ifndef COVERAGE
   CFLAGS   += -O2
   CXXFLAGS += -O2
   LDFLAGS  += -O2
@@ -24,66 +24,58 @@ else
   CXXFLAGS += -O1 -fno-omit-frame-pointer
   LDFLAGS  += -O1 -fno-omit-frame-pointer
 endif
-LDFLAGS  += -Wl,-undefined,error
-CAT      ?= $(if $(filter $(OS),Windows_NT),type,cat)
+CAT ?= $(if $(filter $(OS),Windows_NT),type,cat)
 
 ifneq (,$(findstring /cygdrive/,$(PATH)))
 	UNAME := Cygwin
 else
-	ifneq (,$(findstring Windows_NT,$(OS)))
-		UNAME := Windows
-	else
-		ifneq (,$(findstring mingw32,$(MAKE)))
-			UNAME := Windows
-		else
-			ifneq (,$(findstring MINGW32,$(shell uname -s)))
-				UNAME = Windows
-			else
-				UNAME := $(shell uname -s)
-			endif
-		endif
-	endif
+ifneq (,$(findstring Windows_NT,$(OS)))
+	UNAME := Windows
+else
+ifneq (,$(findstring mingw32,$(MAKE)))
+	UNAME := Windows
+else
+ifneq (,$(findstring MINGW32,$(shell uname -s)))
+	UNAME := Windows
+else
+	UNAME := $(shell uname -s)
+endif
+endif
 endif
-
-ifeq ($(SASS_LIBSASS_PATH),)
-	SASS_LIBSASS_PATH = $(abspath $(CURDIR))
 endif
 
-ifeq ($(LIBSASS_VERSION),)
+ifndef LIBSASS_VERSION
 	ifneq ($(wildcard ./.git/ ),)
 		LIBSASS_VERSION ?= $(shell git describe --abbrev=4 --dirty --always --tags)
 	endif
-endif
-
-ifeq ($(LIBSASS_VERSION),)
 	ifneq ($(wildcard VERSION),)
 		LIBSASS_VERSION ?= $(shell $(CAT) VERSION)
 	endif
 endif
-
-ifneq ($(LIBSASS_VERSION),)
+ifdef LIBSASS_VERSION
 	CFLAGS   += -DLIBSASS_VERSION="\"$(LIBSASS_VERSION)\""
 	CXXFLAGS += -DLIBSASS_VERSION="\"$(LIBSASS_VERSION)\""
 endif
 
-# enable mandatory flag
+CXXFLAGS += -std=c++11
+LDFLAGS  += -std=c++11
+
 ifeq (Windows,$(UNAME))
 	ifneq ($(BUILD),shared)
 		STATIC_ALL     ?= 1
 	endif
 	STATIC_LIBGCC    ?= 1
 	STATIC_LIBSTDCPP ?= 1
-	CXXFLAGS += -std=gnu++0x
-	LDFLAGS  += -std=gnu++0x
 else
 	STATIC_ALL       ?= 0
 	STATIC_LIBGCC    ?= 0
 	STATIC_LIBSTDCPP ?= 0
-	CXXFLAGS += -std=c++0x
-	LDFLAGS  += -std=c++0x
 endif
 
-ifneq ($(SASS_LIBSASS_PATH),)
+ifndef SASS_LIBSASS_PATH
+	SASS_LIBSASS_PATH = $(abspath $(CURDIR))
+endif
+ifdef SASS_LIBSASS_PATH
 	CFLAGS   += -I $(SASS_LIBSASS_PATH)/include
 	CXXFLAGS += -I $(SASS_LIBSASS_PATH)/include
 else
@@ -92,18 +84,11 @@ else
 	CXXFLAGS += -I include
 endif
 
-ifneq ($(EXTRA_CFLAGS),)
-	CFLAGS   += $(EXTRA_CFLAGS)
-endif
-ifneq ($(EXTRA_CXXFLAGS),)
-	CXXFLAGS += $(EXTRA_CXXFLAGS)
-endif
-ifneq ($(EXTRA_LDFLAGS),)
-	LDFLAGS  += $(EXTRA_LDFLAGS)
-endif
+CFLAGS   += $(EXTRA_CFLAGS)
+CXXFLAGS += $(EXTRA_CXXFLAGS)
+LDFLAGS  += $(EXTRA_LDFLAGS)
 
 LDLIBS = -lm
-
 ifneq ($(BUILD),shared)
 	LDLIBS += -lstdc++
 endif
@@ -143,7 +128,7 @@ ifeq ($(DEBUG),1)
 	BUILD := debug-$(BUILD)
 endif
 
-ifeq (,$(TRAVIS_BUILD_DIR))
+ifndef TRAVIS_BUILD_DIR
 	ifeq ($(OS),SunOS)
 		PREFIX ?= /opt/local
 	else
@@ -153,54 +138,36 @@ else
 	PREFIX ?= $(TRAVIS_BUILD_DIR)
 endif
 
-
 SASS_SASSC_PATH ?= sassc
 SASS_SPEC_PATH ?= sass-spec
 SASS_SPEC_SPEC_DIR ?= spec
 SASSC_BIN = $(SASS_SASSC_PATH)/bin/sassc
 RUBY_BIN = ruby
 
+RESOURCES =
+STATICLIB = lib/libsass.a
+SHAREDLIB = lib/libsass.so
 LIB_STATIC = $(SASS_LIBSASS_PATH)/lib/libsass.a
 LIB_SHARED = $(SASS_LIBSASS_PATH)/lib/libsass.so
 
-ifeq (Windows,$(UNAME))
-	ifeq (shared,$(BUILD))
-		CFLAGS     += -D ADD_EXPORTS
-		CXXFLAGS   += -D ADD_EXPORTS
-		LIB_SHARED  = $(SASS_LIBSASS_PATH)/lib/libsass.dll
-	endif
-else
-	ifneq (Cygwin,$(UNAME))
-		CFLAGS   += -fPIC
-		CXXFLAGS += -fPIC
-		LDFLAGS  += -fPIC
-	endif
-endif
-
 ifeq (Windows,$(UNAME))
 	SASSC_BIN = $(SASS_SASSC_PATH)/bin/sassc.exe
-endif
-
-include Makefile.conf
-
-RESOURCES =
-STATICLIB = lib/libsass.a
-SHAREDLIB = lib/libsass.so
-ifeq (Windows,$(UNAME))
 	RESOURCES += res/resource.rc
 	SHAREDLIB  = lib/libsass.dll
 	ifeq (shared,$(BUILD))
 		CFLAGS    += -D ADD_EXPORTS
 		CXXFLAGS  += -D ADD_EXPORTS
+		LIB_SHARED  = $(SASS_LIBSASS_PATH)/lib/libsass.dll
 	endif
 else
-	ifneq (Cygwin,$(UNAME))
-		CFLAGS   += -fPIC
-		CXXFLAGS += -fPIC
-		LDFLAGS  += -fPIC
-	endif
+ifneq (Cygwin,$(UNAME))
+	CFLAGS   += -fPIC
+	CXXFLAGS += -fPIC
+	LDFLAGS  += -fPIC
+endif
 endif
 
+include Makefile.conf
 OBJECTS = $(addprefix src/,$(SOURCES:.cpp=.o))
 COBJECTS = $(addprefix src/,$(CSOURCES:.c=.o))
 RCOBJECTS = $(RESOURCES:.rc=.o)
@@ -230,13 +197,13 @@ debug-shared: shared
 lib:
 	$(MKDIR) lib
 
-lib/libsass.a: lib $(COBJECTS) $(OBJECTS)
+lib/libsass.a: $(COBJECTS) $(OBJECTS) | lib
 	$(AR) rcvs $@ $(COBJECTS) $(OBJECTS)
 
-lib/libsass.so: lib $(COBJECTS) $(OBJECTS)
+lib/libsass.so: $(COBJECTS) $(OBJECTS) | lib
 	$(CXX) -shared $(LDFLAGS) -o $@ $(COBJECTS) $(OBJECTS) $(LDLIBS)
 
-lib/libsass.dll: lib $(COBJECTS) $(OBJECTS) $(RCOBJECTS)
+lib/libsass.dll: $(COBJECTS) $(OBJECTS) $(RCOBJECTS) | lib
 	$(CXX) -shared $(LDFLAGS) -o $@ $(COBJECTS) $(OBJECTS) $(RCOBJECTS) $(LDLIBS) -s -Wl,--subsystem,windows,--out-implib,lib/libsass.a
 
 %.o: %.c
@@ -259,18 +226,17 @@ shared: $(SHAREDLIB)
 $(DESTDIR)$(PREFIX):
 	$(MKDIR) $(DESTDIR)$(PREFIX)
 
-$(DESTDIR)$(PREFIX)/lib: $(DESTDIR)$(PREFIX)
+$(DESTDIR)$(PREFIX)/lib: | $(DESTDIR)$(PREFIX)
 	$(MKDIR) $(DESTDIR)$(PREFIX)/lib
 
-$(DESTDIR)$(PREFIX)/include: $(DESTDIR)$(PREFIX)
+$(DESTDIR)$(PREFIX)/include: | $(DESTDIR)$(PREFIX)
 	$(MKDIR) $(DESTDIR)$(PREFIX)/include
 
-$(DESTDIR)$(PREFIX)/include/sass: $(DESTDIR)$(PREFIX)/include
+$(DESTDIR)$(PREFIX)/include/sass: | $(DESTDIR)$(PREFIX)/include
 	$(MKDIR) $(DESTDIR)$(PREFIX)/include/sass
 
 $(DESTDIR)$(PREFIX)/include/%.h: include/%.h \
-                                 $(DESTDIR)$(PREFIX)/include \
-                                 $(DESTDIR)$(PREFIX)/include/sass
+                                 | $(DESTDIR)$(PREFIX)/include/sass
 	$(INSTALL) -v -m0644 "$<" "$@"
 
 install-headers: $(DESTDIR)$(PREFIX)/include/sass.h \
@@ -282,15 +248,15 @@ install-headers: $(DESTDIR)$(PREFIX)/include/sass.h \
                  $(DESTDIR)$(PREFIX)/include/sass/functions.h
 
 $(DESTDIR)$(PREFIX)/lib/%.a: lib/%.a \
-                             $(DESTDIR)$(PREFIX)/lib
+                             | $(DESTDIR)$(PREFIX)/lib
 	@$(INSTALL) -v -m0755 "$<" "$@"
 
 $(DESTDIR)$(PREFIX)/lib/%.so: lib/%.so \
-                             $(DESTDIR)$(PREFIX)/lib
+                             | $(DESTDIR)$(PREFIX)/lib
 	@$(INSTALL) -v -m0755 "$<" "$@"
 
 $(DESTDIR)$(PREFIX)/lib/%.dll: lib/%.dll \
-                               $(DESTDIR)$(PREFIX)/lib
+                               | $(DESTDIR)$(PREFIX)/lib
 	@$(INSTALL) -v -m0755 "$<" "$@"
 
 install-static: $(DESTDIR)$(PREFIX)/lib/libsass.a
@@ -305,22 +271,20 @@ sassc: $(SASSC_BIN)
 	$(SASSC_BIN) -v
 
 version: $(SASSC_BIN)
-	$(SASSC_BIN) -h
 	$(SASSC_BIN) -v
 
-test: $(SASSC_BIN)
-	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -V 3.5 -c $(SASSC_BIN) --impl libsass $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)
+test: test_build
 
 test_build: $(SASSC_BIN)
-	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -V 3.5 -c $(SASSC_BIN) --impl libsass $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)
+	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)
 
 test_full: $(SASSC_BIN)
-	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -V 3.5 -c $(SASSC_BIN) --impl libsass --run-todo $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)
+	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass --run-todo $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)
 
 test_probe: $(SASSC_BIN)
-	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -V 3.5 -c $(SASSC_BIN) --impl libsass --probe-todo $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)
+	$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass --probe-todo $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)
 
-clean-objects: lib
+clean-objects: | lib
 	-$(RM) lib/*.a lib/*.so lib/*.dll lib/*.la
 	-$(RMDIR) lib
 clean: clean-objects
@@ -347,5 +311,6 @@ lib-opts-shared:
         debug debug-static debug-shared \
         install install-static install-shared \
         lib-opts lib-opts-shared lib-opts-static \
-        lib-file lib-file-shared lib-file-static
+        lib-file lib-file-shared lib-file-static \
+        test test_build test_full test_probe
 .DELETE_ON_ERROR: