[Groonga-commit] groonga/groonga at 6502393 [master] travis: ensure using -DRUBY

Back to archive index
Kouhei Sutou null+****@clear*****
Sun Mar 24 05:29:24 JST 2019


Kouhei Sutou	2019-03-24 05:29:24 +0900 (Sun, 24 Mar 2019)

  Revision: 6502393d0b727348275101cd17a0decd1401bea2
  https://github.com/groonga/groonga/commit/6502393d0b727348275101cd17a0decd1401bea2

  Message:
    travis: ensure using -DRUBY

  Modified files:
    travis/before-script.sh

  Modified: travis/before-script.sh (+4 -2)
===================================================================
--- travis/before-script.sh    2019-03-23 19:37:28 +0900 (d324f2730)
+++ travis/before-script.sh    2019-03-24 05:29:24 +0900 (8ada64471)
@@ -36,6 +36,7 @@ case "${BUILD_TOOL}" in
     ./autogen.sh
 
     configure_args=""
+    configure_args="${configure_args} --with-ruby=$(which ruby)"
     if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
       pkg_config_path="$(brew --prefix openssl)/lib/pkgconfig"
       configure_args="${configure_args} PKG_CONFIG_PATH=${pkg_config_path}"
@@ -53,13 +54,14 @@ case "${BUILD_TOOL}" in
       configure_args="${configure_args} --enable-maintainer-mode"
     fi
 
-    ./configure --prefix=${prefix} --with-ruby=$(which ruby) ${configure_args}
+    ./configure --prefix=${prefix} ${configure_args}
     ;;
   cmake)
     cmake_args=""
+    cmake_args="${cmake_args} -DRUBY=$(which ruby)"
     cmake_args="${cmake_args} -DGRN_WITH_DEBUG=yes"
     if [ "${ENABLE_MRUBY}" = "yes" ]; then
-      cmake_args="${cmake_args} -DRUBY=$(which ruby) -DGRN_WITH_MRUBY=yes"
+      cmake_args="${cmake_args} -DGRN_WITH_MRUBY=yes"
     fi
 
     cmake . ${cmake_args}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20190324/576c482c/attachment-0001.html>


More information about the Groonga-commit mailing list
Back to archive index