From 9dc8767af4e087dfaf2d7d8d56b330af92fbf0d6 Mon Sep 17 00:00:00 2001 From: nonelse Date: Tue, 10 Mar 2020 14:08:35 +0100 Subject: [PATCH] Replace hardcoded system ruby path --- CMakeLists.txt | 2 +- frontend/bin/frontend_command.rb | 2 +- frontend/bin/make_frontend.rb | 1 - .../test/data/TestProgram/TestProgram.xcodeproj/project.pbxproj | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 38814af..f9d6727 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -128,4 +128,4 @@ ENDFOREACH(lib_path) # Generate nullarihyon command ruby script set (INSTALL_LIBEXEC_PREFIX ${CMAKE_INSTALL_PREFIX}/libexec/nullarihyon/${NULL_VERSION}) set (INSTALL_LIB_PREFIX ${CMAKE_INSTALL_PREFIX}/lib/nullarihyon/${NULL_VERSION}) -install(CODE "execute_process(COMMAND /usr/bin/ruby ${PROJECT_SOURCE_DIR}/frontend/bin/make_frontend.rb ${CMAKE_INSTALL_PREFIX}/bin ${INSTALL_LIBEXEC_PREFIX}/nullarihyon-core ${INSTALL_LIB_PREFIX}/clang ${INSTALL_LIB_PREFIX}/frontend ${NULL_VERSION})") +install(CODE "execute_process(COMMAND ruby ${PROJECT_SOURCE_DIR}/frontend/bin/make_frontend.rb ${CMAKE_INSTALL_PREFIX}/bin ${INSTALL_LIBEXEC_PREFIX}/nullarihyon-core ${INSTALL_LIB_PREFIX}/clang ${INSTALL_LIB_PREFIX}/frontend ${NULL_VERSION})") diff --git a/frontend/bin/frontend_command.rb b/frontend/bin/frontend_command.rb index 773e95c..ba96866 100644 --- a/frontend/bin/frontend_command.rb +++ b/frontend/bin/frontend_command.rb @@ -17,4 +17,4 @@ dir_path = Pathname(__dir__).realpath -puts "/usr/bin/ruby -I#{dir_path.parent + "lib"}:#{dir_path.parent + "bundle"} #{dir_path + "frontend.rb"} xcode --analyzer=#{$analyzer_path} --resource-dir=#{$resource_dir_path}" +puts "ruby -I#{dir_path.parent + "lib"}:#{dir_path.parent + "bundle"} #{dir_path + "frontend.rb"} xcode --analyzer=#{$analyzer_path} --resource-dir=#{$resource_dir_path}" diff --git a/frontend/bin/make_frontend.rb b/frontend/bin/make_frontend.rb index bf76f25..6d8b730 100644 --- a/frontend/bin/make_frontend.rb +++ b/frontend/bin/make_frontend.rb @@ -28,7 +28,6 @@ bin_path.open("w") do |io| io.puts <