make [all] now uses the guix build environment (but other targets don't)
This commit is contained in:
parent
3913845ca9
commit
76def29a7f
|
@ -3,6 +3,7 @@ language: c
|
||||||
addons:
|
addons:
|
||||||
apt:
|
apt:
|
||||||
packages: &common_apt_packages
|
packages: &common_apt_packages
|
||||||
|
- guix
|
||||||
# graphical environment
|
# graphical environment
|
||||||
- scrot
|
- scrot
|
||||||
- twm
|
- twm
|
||||||
|
|
13
Makefile
13
Makefile
|
@ -20,6 +20,11 @@ tests_emu = test/qemu-system-i386-floppy test/qemu-system-i386-cdrom test/qemu-s
|
||||||
tests_requiring_sudo = test/fat12_mount test/iso_mount
|
tests_requiring_sudo = test/fat12_mount test/iso_mount
|
||||||
tests_noemu = test/zip test/os.reasm test/sizes test/fat12_contents test/reproducible_build
|
tests_noemu = test/zip test/os.reasm test/sizes test/fat12_contents test/reproducible_build
|
||||||
|
|
||||||
|
.DEFAULT_GOAL := all
|
||||||
|
.PHONY: all
|
||||||
|
all:
|
||||||
|
cp -f "$$(guix build --check -f guix.scm)/bin/$$(basename "${os_filename}")" "${os_filename}"
|
||||||
|
|
||||||
# We truncate the timezone, because the Darwin version of date seems to lack
|
# We truncate the timezone, because the Darwin version of date seems to lack
|
||||||
# the %:z format (for ±HH:MM timezone).
|
# the %:z format (for ±HH:MM timezone).
|
||||||
define date_command
|
define date_command
|
||||||
|
@ -52,10 +57,10 @@ include Makefile.test-example-os
|
||||||
|
|
||||||
more_built_directories = ${built_directories} ${bld}
|
more_built_directories = ${built_directories} ${bld}
|
||||||
|
|
||||||
.PHONY: all
|
.PHONY: in-guix
|
||||||
# all: os.arm.disasm
|
# in-guix: os.arm.disasm
|
||||||
all: .gitignore \
|
in-guix: .gitignore \
|
||||||
${bld}/check_makefile
|
${bld}/check_makefile
|
||||||
|
|
||||||
${bld}/makefile_w_arnings: | $${@D}
|
${bld}/makefile_w_arnings: | $${@D}
|
||||||
${built_files}: | $${@D}
|
${built_files}: | $${@D}
|
||||||
|
|
|
@ -73,17 +73,17 @@ os_partition_size_sectors = 717 # 720 - start
|
||||||
os_floppy_chs_h = 2
|
os_floppy_chs_h = 2
|
||||||
os_floppy_chs_s = 9
|
os_floppy_chs_s = 9
|
||||||
|
|
||||||
all: ${os_filename} \
|
in-guix: ${os_filename} \
|
||||||
${bld}/os.ndisasm.disasm \
|
${bld}/os.ndisasm.disasm \
|
||||||
${bld}/os.reasm.asm \
|
${bld}/os.reasm.asm \
|
||||||
${bld}/os.file \
|
${bld}/os.file \
|
||||||
${bld}/os.gdisk \
|
${bld}/os.gdisk \
|
||||||
${bld}/os.offsets.hex \
|
${bld}/os.offsets.hex \
|
||||||
${bld}/os.offsets.dec \
|
${bld}/os.offsets.dec \
|
||||||
${bld}/os.hex_with_offsets \
|
${bld}/os.hex_with_offsets \
|
||||||
${more_offset_dec} \
|
${more_offset_dec} \
|
||||||
${more_offset_hex} \
|
${more_offset_hex} \
|
||||||
${bld}/check_makefile
|
${bld}/check_makefile
|
||||||
|
|
||||||
# 32k header of the ISO9660 image
|
# 32k header of the ISO9660 image
|
||||||
${bld}/os.32k: example-os/os.asm ${bld}/check_makefile
|
${bld}/os.32k: example-os/os.asm ${bld}/check_makefile
|
||||||
|
|
2
guix.scm
2
guix.scm
|
@ -81,7 +81,7 @@
|
||||||
(delete 'patch-shebangs)
|
(delete 'patch-shebangs)
|
||||||
(delete 'strip))
|
(delete 'strip))
|
||||||
#:parallel-build? #t
|
#:parallel-build? #t
|
||||||
#:make-flags '("COMMIT_TIMESTAMP_ISO_8601=1970-01-01T00:00:00+00:00")))
|
#:make-flags '("in-guix" "COMMIT_TIMESTAMP_ISO_8601=1970-01-01T00:00:00+00:00")))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("nasm" ,nasm)
|
`(("nasm" ,nasm)
|
||||||
("which" ,which)
|
("which" ,which)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user