josh/rscons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

configure checks: compile instead of link when looking for C/C++ header files and D imports

Browse Source
This commit is contained in:
Josh Holtrop 2019-07-09 23:41:51 -04:00
parent d6b9487e65
commit 3aac190ad6
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/rscons/configure_op.rb
View File

@ -139,9 +139,10 @@ module Rscons
vars = { vars = {
"LD" => "${CC}", "LD" => "${CC}",
"_SOURCES" => "#{@work_dir}/cfgtest.c", "_SOURCES" => "#{@work_dir}/cfgtest.c",
"_TARGET" => "#{@work_dir}/cfgtest.exe", "_TARGET" => "#{@work_dir}/cfgtest.o",
"_DEPFILE" => "#{@work_dir}/cfgtest.mf",
} }
command = BasicEnvironment.new.build_command("${LDCMD}", vars) command = BasicEnvironment.new.build_command("${CCCMD}", vars)
_, _, status = log_and_test_command(command) _, _, status = log_and_test_command(command)
common_config_checks(status, options) common_config_checks(status, options)
end end
@ -160,9 +161,10 @@ module Rscons
vars = { vars = {
"LD" => "${CXX}", "LD" => "${CXX}",
"_SOURCES" => "#{@work_dir}/cfgtest.cxx", "_SOURCES" => "#{@work_dir}/cfgtest.cxx",
"_TARGET" => "#{@work_dir}/cfgtest.exe", "_TARGET" => "#{@work_dir}/cfgtest.o",
"_DEPFILE" => "#{@work_dir}/cfgtest.mf",
} }
command = BasicEnvironment.new.build_command("${LDCMD}", vars) command = BasicEnvironment.new.build_command("${CXXCMD}", vars)
_, _, status = log_and_test_command(command) _, _, status = log_and_test_command(command)
common_config_checks(status, options) common_config_checks(status, options)
end end
@ -181,9 +183,10 @@ module Rscons
vars = { vars = {
"LD" => "${DC}", "LD" => "${DC}",
"_SOURCES" => "#{@work_dir}/cfgtest.d", "_SOURCES" => "#{@work_dir}/cfgtest.d",
"_TARGET" => "#{@work_dir}/cfgtest.exe", "_TARGET" => "#{@work_dir}/cfgtest.o",
"_DEPFILE" => "#{@work_dir}/cfgtest.mf",
} }
command = BasicEnvironment.new.build_command("${LDCMD}", vars) command = BasicEnvironment.new.build_command("${DCCMD}", vars)
_, _, status = log_and_test_command(command) _, _, status = log_and_test_command(command)
common_config_checks(status, options) common_config_checks(status, options)
end end