From 28b78eb3d97f33f99316fdc4f8c0d99a4dd0a422 Mon Sep 17 00:00:00 2001 From: mattn Date: Tue, 18 Dec 2012 14:13:14 +0900 Subject: fix build: add LIBS flag. and fix quoted arguments on windows. --- Rakefile | 6 ++++-- mrbgems/build_tasks.rb | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Rakefile b/Rakefile index a5172afc5..fe966879d 100644 --- a/Rakefile +++ b/Rakefile @@ -34,12 +34,13 @@ else # including 'debug' CFLAGS = if e then [e] else ['-g', '-O3'] end end LDFLAGS = [ENV['LDFLAGS']] +LIBS = [ENV['LIBS']] CFLAGS << "-Wall" << "-Werror-implicit-function-declaration" << "-I#{MRUBY_ROOT}/include" if ENV['OS'] == 'Windows_NT' - MAKE_FLAGS = "--no-print-directory CC=#{CC} LL=#{LL} CFLAGS='#{CFLAGS.join(' ')}' LDFLAGS='#{LDFLAGS.join(' ')}' ENABLE_GEMS='#{ENABLE_GEMS}' MRUBY_ROOT='#{MRUBY_ROOT}'" + MAKE_FLAGS = "--no-print-directory CC=#{CC} LL=#{LL} CFLAGS=\"#{CFLAGS.join(' ')}\" LDFLAGS=\"#{LDFLAGS.join(' ')}\" LIBS=\"#{LIBS.join(' ')}\" ENABLE_GEMS=\"#{ENABLE_GEMS}\" MRUBY_ROOT=\"#{MRUBY_ROOT}\"" else - MAKE_FLAGS = "--no-print-directory CC='#{CC}' LL='#{LL}' CFLAGS='#{CFLAGS.join(' ')}' LDFLAGS='#{LDFLAGS.join(' ')}' ENABLE_GEMS='#{ENABLE_GEMS}' MRUBY_ROOT='#{MRUBY_ROOT}'" + MAKE_FLAGS = "--no-print-directory CC='#{CC}' LL='#{LL}' CFLAGS='#{CFLAGS.join(' ')}' LDFLAGS='#{LDFLAGS.join(' ')}' LIBS='#{LIBS.join(' ')}' ENABLE_GEMS='#{ENABLE_GEMS}' MRUBY_ROOT='#{MRUBY_ROOT}'" end @@ -98,4 +99,5 @@ task :showconfig do puts "" puts " CFLAGS = #{CFLAGS.join(' ')}" puts " LDFLAGS = #{LDFLAGS.join(' ')}" + puts " LIBS = #{LIBS.join(' ')}" end diff --git a/mrbgems/build_tasks.rb b/mrbgems/build_tasks.rb index 0e2d24a2e..0eb2608bf 100644 --- a/mrbgems/build_tasks.rb +++ b/mrbgems/build_tasks.rb @@ -5,7 +5,11 @@ GEM_MAKEFILE = "#{MRBGEMS_PATH}/g/Makefile" GEM_MAKEFILE_LIST = "#{MRBGEMS_PATH}/g/MakefileGemList" MAKEFILE_4_GEM = "#{MRUBY_ROOT}/mrbgems/Makefile4gem" +if ENV['OS'] == 'Windows_NT' +GEM_MAKE_FLAGS = "#{MAKE_FLAGS} MAKEFILE_4_GEM=\"#{MAKEFILE_4_GEM}\"" +else GEM_MAKE_FLAGS = "#{MAKE_FLAGS} MAKEFILE_4_GEM='#{MAKEFILE_4_GEM}'" +end task :mrbgems_all => ["#{GEM_INIT}.a", :mrbgems_generate_gem_makefile_list] do for_each_gem do |path, gemname| -- cgit v1.2.3