From 7112db9fba80d7542d2bd17d67f032e7d3cb68b8 Mon Sep 17 00:00:00 2001
From: dearblue <dearblue@users.osdn.me>
Date: Sun, 17 Sep 2023 17:48:36 +0900
Subject: [PATCH] Extends `bin/mruby-config`

Added output for C++ and Assembly, ObjectiveC.
---
 mrbgems/mruby-bin-config/mruby-config     | 16 +++++++--
 mrbgems/mruby-bin-config/mruby-config.bat | 40 +++++++++++++++++++++--
 2 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/mrbgems/mruby-bin-config/mruby-config b/mrbgems/mruby-bin-config/mruby-config
index 3adda9e1a..27365e650 100755
--- a/mrbgems/mruby-bin-config/mruby-config
+++ b/mrbgems/mruby-bin-config/mruby-config
@@ -4,8 +4,14 @@ print_help()
 {
   echo "Usage: mruby-config [switches]"
   echo "  switches:"
-  echo "  --cc                        print compiler name"
-  echo "  --cflags                    print flags passed to compiler"
+  echo "  --cc                        print C compiler name"
+  echo "  --cflags                    print flags passed to C compiler"
+  echo "  --cxx                       print C++ compiler name"
+  echo "  --cxxflags                  print flags passed to C++ compiler"
+  echo "  --as                        print assembler name"
+  echo "  --asflags                   print flags passed to assembler"
+  echo "  --objc                      print Objective C compiler name"
+  echo "  --objcflags                 print flags passed to Objective C compiler"
   echo "  --ld                        print linker name"
   echo "  --ldflags                   print flags passed to linker"
   echo "  --ldflags-before-libs       print flags passed to linker before linked libraries"
@@ -23,6 +29,12 @@ while [ $# -gt 0 ]; do
   case $1 in
     --cc) echo MRUBY_CC;;
     --cflags) echo MRUBY_CFLAGS;;
+    --cxx) echo MRUBY_CXX;;
+    --cxxflags) echo MRUBY_CXXFLAGS;;
+    --as) echo MRUBY_AS;;
+    --asflags) echo MRUBY_ASFLAGS;;
+    --objc) echo MRUBY_OBJC;;
+    --objcflags) echo MRUBY_OBJCFLAGS;;
     --ld) echo MRUBY_LD;;
     --ldflags) echo MRUBY_LDFLAGS;;
     --ldflags-before-libs) echo MRUBY_LDFLAGS_BEFORE_LIBS;;
diff --git a/mrbgems/mruby-bin-config/mruby-config.bat b/mrbgems/mruby-bin-config/mruby-config.bat
index 8d8a589fe..fa7ad2a63 100644
--- a/mrbgems/mruby-bin-config/mruby-config.bat
+++ b/mrbgems/mruby-bin-config/mruby-config.bat
@@ -17,6 +17,12 @@ shift
 if "%0" equ "" goto :eof
 if "%0" equ "--cc" goto cc
 if "%0" equ "--cflags" goto cflags
+if "%0" equ "--cxx" goto cxx
+if "%0" equ "--cxxflags" goto cxxflags
+if "%0" equ "--as" goto as
+if "%0" equ "--asflags" goto asflags
+if "%0" equ "--objc" goto objc
+if "%0" equ "--objcflags" goto objcflags
 if "%0" equ "--ld" goto ld
 if "%0" equ "--ldflags" goto ldflags
 if "%0" equ "--ldflags-before-libs" goto ldflagsbeforelibs
@@ -34,6 +40,30 @@ goto top
 echo MRUBY_CFLAGS
 goto top
 
+:cxx
+echo MRUBY_CXX
+goto top
+
+:cxxflags
+echo MRUBY_CXXFLAGS
+goto top
+
+:as
+echo MRUBY_AS
+goto top
+
+:asflags
+echo MRUBY_ASFLAGS
+goto top
+
+:objc
+echo MRUBY_OBJC
+goto top
+
+:objcflags
+echo MRUBY_OBJCFLAGS
+goto top
+
 :ld
 echo MRUBY_LD
 goto top
@@ -57,8 +87,14 @@ goto top
 :showhelp
 echo Usage: mruby-config [switches]
 echo   switches:
-echo   --cc                       print compiler name
-echo   --cflags                   print flags passed to compiler
+echo   --cc                       print C compiler name
+echo   --cflags                   print flags passed to C compiler
+echo   --cxx                      print C++ compiler name
+echo   --cxxflags                 print flags passed to C++ compiler
+echo   --as                       print assembler name
+echo   --asflags                  print flags passed to assembler
+echo   --objc                     print Objective C compiler name
+echo   --objcflags                print flags passed to Objective C compiler
 echo   --ld                       print linker name
 echo   --ldflags                  print flags passed to linker
 echo   --ldflags-before-libs      print flags passed to linker before linked libraries