diff --git a/lib/rscons/builders/library.rb b/lib/rscons/builders/library.rb index 600a374..28d8f32 100644 --- a/lib/rscons/builders/library.rb +++ b/lib/rscons/builders/library.rb @@ -8,7 +8,7 @@ module Rscons 'AR' => 'ar', 'LIBSUFFIX' => '.a', 'ARFLAGS' => [], - 'ARCOM' => ['${AR}', 'rcs', '${ARFLAGS}', '${_TARGET}', '${_SOURCES}'] + 'ARCMD' => ['${AR}', 'rcs', '${ARFLAGS}', '${_TARGET}', '${_SOURCES}'] } end @@ -20,7 +20,7 @@ module Rscons '_TARGET' => target, '_SOURCES' => objects, }) - command = env.build_command(env['ARCOM'], vars) + command = env.build_command(env['ARCMD'], vars) standard_build("AR #{target}", target, command, objects, env, cache) end end diff --git a/lib/rscons/builders/object.rb b/lib/rscons/builders/object.rb index 6c2ead4..0b7d3da 100644 --- a/lib/rscons/builders/object.rb +++ b/lib/rscons/builders/object.rb @@ -19,7 +19,7 @@ module Rscons 'ASPPPATH' => '${CPPPATH}', 'ASPPFLAGS' => '${CPPFLAGS}', 'ASDEPGEN' => ['-MMD', '-MF', '${_DEPFILE}'], - 'ASCOM' => ['${AS}', '-c', '-o', '${_TARGET}', '${ASDEPGEN}', '-I${ASPPPATH}', '${ASPPFLAGS}', '${ASFLAGS}', '${_SOURCES}'], + 'ASCMD' => ['${AS}', '-c', '-o', '${_TARGET}', '${ASDEPGEN}', '-I${ASPPPATH}', '${ASPPFLAGS}', '${ASFLAGS}', '${_SOURCES}'], 'CPPFLAGS' => [], 'CPPPATH' => [], @@ -28,19 +28,19 @@ module Rscons 'CFLAGS' => [], 'CSUFFIX' => '.c', 'CCDEPGEN' => ['-MMD', '-MF', '${_DEPFILE}'], - 'CCCOM' => ['${CC}', '-c', '-o', '${_TARGET}', '${CCDEPGEN}', '-I${CPPPATH}', '${CPPFLAGS}', '${CFLAGS}', '${_SOURCES}'], + 'CCCMD' => ['${CC}', '-c', '-o', '${_TARGET}', '${CCDEPGEN}', '-I${CPPPATH}', '${CPPFLAGS}', '${CFLAGS}', '${_SOURCES}'], 'CXX' => 'g++', 'CXXFLAGS' => [], 'CXXSUFFIX' => '.cc', 'CXXDEPGEN' => ['-MMD', '-MF', '${_DEPFILE}'], - 'CXXCOM' =>['${CXX}', '-c', '-o', '${_TARGET}', '${CXXDEPGEN}', '-I${CPPPATH}', '${CPPFLAGS}', '${CXXFLAGS}', '${_SOURCES}'], + 'CXXCMD' =>['${CXX}', '-c', '-o', '${_TARGET}', '${CXXDEPGEN}', '-I${CPPPATH}', '${CPPFLAGS}', '${CXXFLAGS}', '${_SOURCES}'], 'DC' => 'gdc', 'DFLAGS' => [], 'DSUFFIX' => '.d', 'D_IMPORT_PATH' => [], - 'DCCOM' => ['${DC}', '-c', '-o', '${_TARGET}', '-I${D_IMPORT_PATH}', '${DFLAGS}', '${_SOURCES}'], + 'DCCMD' => ['${DC}', '-c', '-o', '${_TARGET}', '-I${D_IMPORT_PATH}', '${DFLAGS}', '${_SOURCES}'], } end @@ -61,7 +61,7 @@ module Rscons end.tap do |v| v.nil? and raise "Error: unknown input file type: #{sources.first.inspect}" end.first - command = env.build_command(env["#{com_prefix}COM"], vars) + command = env.build_command(env["#{com_prefix}CMD"], vars) unless cache.up_to_date?(target, command, sources) cache.mkdir_p(File.dirname(target)) FileUtils.rm_f(target) diff --git a/lib/rscons/builders/program.rb b/lib/rscons/builders/program.rb index 3254a64..780fd00 100644 --- a/lib/rscons/builders/program.rb +++ b/lib/rscons/builders/program.rb @@ -10,7 +10,7 @@ module Rscons 'LDFLAGS' => [], 'LIBPATH' => [], 'LIBS' => [], - 'LDCOM' => ['${LD}', '-o', '${_TARGET}', '${LDFLAGS}', '${_SOURCES}', '-L${LIBPATH}', '-l${LIBS}'] + 'LDCMD' => ['${LD}', '-o', '${_TARGET}', '${LDFLAGS}', '${_SOURCES}', '-L${LIBPATH}', '-l${LIBS}'] } end @@ -31,7 +31,7 @@ module Rscons '_SOURCES' => objects, 'LD' => ld, }) - command = env.build_command(env['LDCOM'], vars) + command = env.build_command(env['LDCMD'], vars) standard_build("LD #{target}", target, command, objects, env, cache) end end