mirrors/linuxboot
1
0
Fork 0
mirror of https://github.com/linuxboot/linuxboot synced 2024-11-21 23:59:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

use relative outputs for musl-gcc and cross-gcc, clean up coreboot.rom (issue #62)

Browse Source
This commit is contained in:
Trammell Hudson 2017-03-20 17:52:54 -04:00 committed by Trammell Hudson
parent 279851e66d
commit 9d638c8f8d
Failed to extract signature
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -38,7 +38,7 @@ heads_cc := $(INSTALL)/bin/musl-gcc \
-fdebug-prefix-map=$(pwd)=heads \ -fdebug-prefix-map=$(pwd)=heads \
-gno-record-gcc-switches \ -gno-record-gcc-switches \
CROSS := $(pwd)/crossgcc/x86_64-linux-musl/bin/x86_64-musl-linux- CROSS := $(build)/$(musl-cross_dir)/../../crossgcc/x86_64-linux-musl/bin/x86_64-musl-linux-
#heads_cc := $(HOME)/install/x86_64-linux-musl/x86_64-linux-musl/bin/gcc #heads_cc := $(HOME)/install/x86_64-linux-musl/x86_64-linux-musl/bin/gcc
@ -136,7 +136,7 @@ define define_module =
$(VERBOSE_REDIRECT) $(VERBOSE_REDIRECT)
touch "$$@" touch "$$@"
# Build the target after any dependencies # All of the outputs should result from building the intermediate target
$(call outputs,$1): $1.intermediate $(call outputs,$1): $1.intermediate
# Short hand target for the module # Short hand target for the module
@ -144,8 +144,8 @@ define define_module =
# Target for all of the outputs, which depend on their dependent modules # Target for all of the outputs, which depend on their dependent modules
$1.intermediate: \ $1.intermediate: \
$(foreach d,$($1_depends),$(call outputs,$d)) \
$(foreach d,$($1_depends),$d.intermediate) \ $(foreach d,$($1_depends),$d.intermediate) \
$(foreach d,$($1_depends),$(call outputs,$d)) \
$(build)/$($1_dir)/.configured $(build)/$($1_dir)/.configured
@echo "$(DATE) Building $1" @echo "$(DATE) Building $1"
@( $(MAKE) \ @( $(MAKE) \
@ -301,7 +301,7 @@ $(build)/$(coreboot_dir)/initrd.cpio.xz: initrd.cpio
> "$@" > "$@"
# hack for the coreboot to find the linux kernel # hack for the coreboot to find the linux kernel
$(build)/$(coreboot_dir)/bzImage: $(call outputs,linux) $(build)/$(coreboot_dir)/bzImage: linux.intermediate
@echo "$(DATE) Copying $@" @echo "$(DATE) Copying $@"
@cp -a "$^" "$@" @cp -a "$^" "$@"
coreboot.intermediate: $(build)/$(coreboot_dir)/bzImage coreboot.intermediate: $(build)/$(coreboot_dir)/bzImage
@ -315,10 +315,12 @@ coreboot.intermediate: $(build)/$(coreboot_dir)/bzImage
x230.rom: $(build)/$(coreboot_dir)/x230/coreboot.rom x230.rom: $(build)/$(coreboot_dir)/x230/coreboot.rom
"$(build)/$(coreboot_dir)/$(BOARD)/cbfstool" "$<" print "$(build)/$(coreboot_dir)/$(BOARD)/cbfstool" "$<" print
dd if="$<" of="$@" bs=1M skip=8 dd if="$<" of="$@" bs=1M skip=8
$(RM) "$<"
qemu.rom: $(build)/$(coreboot_dir)/qemu/coreboot.rom qemu.rom: $(build)/$(coreboot_dir)/qemu/coreboot.rom
"$(build)/$(coreboot_dir)/$(BOARD)/cbfstool" "$<" print "$(build)/$(coreboot_dir)/$(BOARD)/cbfstool" "$<" print
cp -a "$<" "$@" mv "$<" "$@"
clean-modules: clean-modules:
for dir in \ for dir in \

2
modules/musl
View File

@ -6,7 +6,7 @@ musl_tar := musl-$(musl_version).tar.gz
musl_url := https://www.musl-libc.org/releases/$(musl_tar) musl_url := https://www.musl-libc.org/releases/$(musl_tar)
musl_hash := 97e447c7ee2a7f613186ec54a93054fe15469fe34d7d323080f7ef38f5ecb0fa musl_hash := 97e447c7ee2a7f613186ec54a93054fe15469fe34d7d323080f7ef38f5ecb0fa
musl_output := $(INSTALL)/bin/musl-gcc musl_output := ../../install/bin/musl-gcc
# #
# Note that for syslibdir to be /lib the install will fail. # Note that for syslibdir to be /lib the install will fail.

2
modules/musl-cross
View File

@ -4,7 +4,7 @@ musl-cross_version := git
musl-cross_dir := musl-cross-$(musl-cross_version) musl-cross_dir := musl-cross-$(musl-cross_version)
musl-cross_repo := https://github.com/GregorR/musl-cross musl-cross_repo := https://github.com/GregorR/musl-cross
musl-cross_output := $(pwd)/crossgcc/x86_64-linux-musl/bin/x86_64-linux-musl-gcc musl-cross_output := ../../crossgcc/x86_64-linux-musl/bin/x86_64-linux-musl-gcc
musl-cross_configure := \ musl-cross_configure := \
/bin/echo -e > Makefile \ /bin/echo -e > Makefile \