From 3aac190ad687b82142a2607709c0d6aeb9c91fce Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Tue, 9 Jul 2019 23:41:51 -0400 Subject: [PATCH] configure checks: compile instead of link when looking for C/C++ header files and D imports --- lib/rscons/configure_op.rb | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/rscons/configure_op.rb b/lib/rscons/configure_op.rb index 0b5552c..5f67437 100644 --- a/lib/rscons/configure_op.rb +++ b/lib/rscons/configure_op.rb @@ -139,9 +139,10 @@ module Rscons vars = { "LD" => "${CC}", "_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) common_config_checks(status, options) end @@ -160,9 +161,10 @@ module Rscons vars = { "LD" => "${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) common_config_checks(status, options) end @@ -181,9 +183,10 @@ module Rscons vars = { "LD" => "${DC}", "_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) common_config_checks(status, options) end