diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-04-22 15:16:57 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-04-22 15:16:57 +0900 |
| commit | 809b7ca3f4e93dc44ec4ba7d2cf3716834f25887 (patch) | |
| tree | 3d3ea2a9b246b37c75f5d7edcd6b66e0ce3ddcda | |
| parent | a4dfaaf1e89eb9eb5f5ed237a791866cfc49837f (diff) | |
| parent | 52a03800d34006ac2f5f45f7286a63ae988ae55f (diff) | |
| download | mruby-809b7ca3f4e93dc44ec4ba7d2cf3716834f25887.tar.gz mruby-809b7ca3f4e93dc44ec4ba7d2cf3716834f25887.zip | |
Merge pull request #3628 from yyamano/libmruby-path
Add --libmruby-path support to mruby-bin-mruby-config.
| -rw-r--r-- | mrbgems/mruby-bin-mruby-config/mrbgem.rake | 2 | ||||
| -rw-r--r-- | mrbgems/mruby-bin-mruby-config/mruby-config | 2 | ||||
| -rw-r--r-- | mrbgems/mruby-bin-mruby-config/mruby-config.bat | 6 | ||||
| -rw-r--r-- | tasks/libmruby.rake | 2 |
4 files changed, 11 insertions, 1 deletions
diff --git a/mrbgems/mruby-bin-mruby-config/mrbgem.rake b/mrbgems/mruby-bin-mruby-config/mrbgem.rake index 73f971a91..66d6ef80b 100644 --- a/mrbgems/mruby-bin-mruby-config/mrbgem.rake +++ b/mrbgems/mruby-bin-mruby-config/mrbgem.rake @@ -23,7 +23,7 @@ MRuby.each_target do FileUtils.copy "#{File.dirname(__FILE__)}/#{mruby_config}", t.name config = Hash[open("#{build_dir}/lib/libmruby.flags.mak").read.split("\n").map {|x| a = x.split(/\s*=\s*/, 2); [a[0], a[1].gsub('\\"', '"') ]}] IO.write(t.name, File.open(t.name) {|f| - f.read.gsub (/echo (MRUBY_CFLAGS|MRUBY_LIBS|MRUBY_LDFLAGS_BEFORE_LIBS|MRUBY_LDFLAGS)/) {|x| config[$1].empty? ? '' : "echo #{config[$1]}"} + f.read.gsub (/echo (MRUBY_CFLAGS|MRUBY_LIBS|MRUBY_LDFLAGS_BEFORE_LIBS|MRUBY_LDFLAGS|MRUBY_LIBMRUBY_PATH)/) {|x| config[$1].empty? ? '' : "echo #{config[$1]}"} }) FileUtils.chmod(0755, t.name) end diff --git a/mrbgems/mruby-bin-mruby-config/mruby-config b/mrbgems/mruby-bin-mruby-config/mruby-config index 14a4f1630..57346c03f 100644 --- a/mrbgems/mruby-bin-mruby-config/mruby-config +++ b/mrbgems/mruby-bin-mruby-config/mruby-config @@ -6,12 +6,14 @@ while [ $# -gt 0 ]; do --ldflags) echo MRUBY_LDFLAGS;; --ldflags-before-libs) echo MRUBY_LDFLAGS_BEFORE_LIBS;; --libs) echo MRUBY_LIBS;; + --libmruby-path) echo MRUBY_LIBMRUBY_PATH;; --help) echo "Usage: mruby-config [switches]" echo " switches:" echo " --cflags print flags passed to compiler" echo " --ldflags print flags passed to linker" echo " --ldflags-before-libs print flags passed to linker before linked libraries" echo " --libs print linked libraries" + echo " --libmruby-path print libmruby path" exit 0;; esac shift diff --git a/mrbgems/mruby-bin-mruby-config/mruby-config.bat b/mrbgems/mruby-bin-mruby-config/mruby-config.bat index 8cd7e78ef..a1f7bfdd1 100644 --- a/mrbgems/mruby-bin-mruby-config/mruby-config.bat +++ b/mrbgems/mruby-bin-mruby-config/mruby-config.bat @@ -7,6 +7,7 @@ if "%0" equ "--cflags" goto cflags if "%0" equ "--ldflags" goto ldflags if "%0" equ "--ldflags-before-libs" goto ldflagsbeforelibs if "%0" equ "--libs" goto libs +if "%0" equ "--libmruby-path" goto libmrubypath if "%0" equ "--help" goto showhelp echo Invalid Option goto :eof @@ -27,6 +28,10 @@ goto top echo MRUBY_LDFLAGS_BEFORE_LIBS goto top +:libmrubypath +echo MRUBY_LIBMRUBY_PATH +goto top + :showhelp echo Usage: mruby-config [switches] echo switches: @@ -34,3 +39,4 @@ echo --cflags print flags passed to compiler echo --ldflags print flags passed to linker echo --ldflags-before-libs print flags passed to linker before linked libraries echo --libs print linked libraries +echo --libmruby-path print libmruby path diff --git a/tasks/libmruby.rake b/tasks/libmruby.rake index 23663d0a5..540aa3eb5 100644 --- a/tasks/libmruby.rake +++ b/tasks/libmruby.rake @@ -16,6 +16,8 @@ MRuby.each_target do gem_libraries = gems.map { |g| g.linker.libraries } f.puts "MRUBY_LIBS = #{linker.option_library % 'mruby'} #{linker.library_flags(gem_libraries)}" + + f.puts "MRUBY_LIBMRUBY_PATH = #{libfile("#{build_dir}/lib/libmruby")}" end end task :all => "#{build_dir}/lib/libmruby.flags.mak" |