Update rscons

This commit is contained in:
Josh Holtrop 2022-03-07 20:54:19 -05:00
parent aa21b199d5
commit 353e3d7276
2 changed files with 51 additions and 27 deletions

View File

@ -3,8 +3,7 @@ configure do
check_program "x86_64-w64-mingw32-gcc" check_program "x86_64-w64-mingw32-gcc"
end end
build do class Image < Builder
class Image < Builder
def run(options) def run(options)
unless @cache.up_to_date?(@target, nil, @sources, @env) unless @cache.up_to_date?(@target, nil, @sources, @env)
print_run_message("Image <target>#{@target}<reset>", nil) print_run_message("Image <target>#{@target}<reset>", nil)
@ -17,8 +16,9 @@ build do
end end
true true
end end
end end
Environment.new do |env|
env do |env|
env.add_builder(Image) env.add_builder(Image)
env["CC"] = "x86_64-w64-mingw32-gcc" env["CC"] = "x86_64-w64-mingw32-gcc"
env["CPPPATH"] += %w[/usr/include/efi /usr/include/efi/x86_64] env["CPPPATH"] += %w[/usr/include/efi /usr/include/efi/x86_64]
@ -28,5 +28,4 @@ build do
env["sources"] = glob("*.c") env["sources"] = glob("*.c")
env.Program("^/BOOTX64.EFI", "${sources}") env.Program("^/BOOTX64.EFI", "${sources}")
env.Image("^/efi-loader.img", "^/BOOTX64.EFI") env.Image("^/efi-loader.img", "^/BOOTX64.EFI")
end
end end

31
rscons

File diff suppressed because one or more lines are too long