Skip to content

Commit 0217cf5

Browse files
committed
Properly handle both compile and native gem tasks
AppVeyor CI was setup to run `native gem` task, but neither DevKit or port was properly hook up for it to work. This change aims to correct that.
1 parent 4ad6d95 commit 0217cf5

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

tasks/vendor_sqlite3.rake

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ recipe = define_sqlite_task(RUBY_PLATFORM, RbConfig::CONFIG["host"])
3434
if RUBY_PLATFORM =~ /mingw/
3535
RUBY_EXTENSION.config_options << "--with-opt-dir=#{recipe.path}"
3636

37-
Rake::Task['compile'].prerequisites.unshift "ports:sqlite3:#{RUBY_PLATFORM}"
37+
# also prepend DevKit into compilation phase
38+
Rake::Task["compile"].prerequisites.unshift "devkit", "ports:sqlite3:#{RUBY_PLATFORM}"
39+
Rake::Task["native"].prerequisites.unshift "devkit", "ports:sqlite3:#{RUBY_PLATFORM}"
3840
end
3941

4042
# trick to test local compilation of sqlite3
@@ -87,9 +89,3 @@ task :cross do
8789
ENV.delete(var)
8890
end
8991
end
90-
91-
# prepend DevKit into compilation phase
92-
if RUBY_PLATFORM =~ /mingw/
93-
Rake::Task["compile"].prerequisites.unshift "devkit"
94-
Rake::Task["native"].prerequisites.unshift "devkit"
95-
end

0 commit comments

Comments
 (0)