FFFF boulder: Set OBJDUMP/READELF by ReillyBrogan · Pull Request #911 · aerynOS/os-tools · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions boulder/data/macros/arch/base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@ definitions:
- compiler_d : "%(_compiler_d)"
- compiler_ar : "%(_compiler_ar)"
- compiler_objcopy : "%(_compiler_objcopy)"
- compiler_objdump : "%(_compiler_objdump)"
- compiler_nm : "%(_compiler_nm)"
- compiler_ranlib : "%(_compiler_ranlib)"
- compiler_readelf : "%(_compiler_readelf)"
- compiler_strip : "%(_compiler_strip)"
- compiler_path : "%(_compiler_path)"
- compiler_ld : "%(_compiler_ld)"
Expand Down Expand Up @@ -96,8 +98,10 @@ definitions:
- ar : "%(compiler_ar)"
- ld : "%(compiler_ld)"
- objcopy : "%(compiler_objcopy)"
- objdump : "%(compiler_objdump)"
- nm : "%(compiler_nm)"
- ranlib : "%(compiler_ranlib)"
- readelf : "%(compiler_readelf)"
- strip : "%(compiler_strip)"
- path : "%(compiler_path)"
- ccachedir : "%(compiler_cache)"
Expand Down Expand Up @@ -144,8 +148,10 @@ actions :
AR="%(ar)"; export AR
LD="%(ld)"; export LD
OBJCOPY="%(objcopy)"; export OBJCOPY
OBJDUMP="%(objdump)"; export OBJDUMP
NM="%(nm)"; export NM
RANLIB="%(ranlib)"; export RANLIB
READELF="%(readelf)"; export READELF
STRIP="%(strip)"; export STRIP
PATH="%(path)"; export PATH
GOAMD64="%(goamd64_arch)"; export GOAMD64
Expand Down
4 changes: 4 additions & 0 deletions boulder/src/build/job/phase.rs
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,10 @@ impl Phase {
env.add_builtin_string("compiler_d", "ldc2");
env.add_builtin_string("compiler_ar", "llvm-ar");
env.add_builtin_string("compiler_objcopy", "llvm-objcopy");
env.add_builtin_string("compiler_objdump", "llvm-objdump");
env.add_builtin_string("compiler_nm", "llvm-nm");
env.add_builtin_string("compiler_ranlib", "llvm-ranlib");
env.add_builtin_string("compiler_readelf", "llvm-readelf");
env.add_builtin_string("compiler_strip", "llvm-strip");
} else {
env.add_builtin_string("compiler_c", "gcc");
Expand All @@ -191,8 +193,10 @@ impl Phase {
env.add_builtin_string("compiler_d", "ldc2"); // FIXME: GDC
env.add_builtin_string("compiler_ar", "gcc-ar");
env.add_builtin_string("compiler_objcopy", "objcopy");
env.add_builtin_string("compiler_objdump", "objdump");
env.add_builtin_string("compiler_nm", "gcc-nm");
env.add_builtin_string("compiler_ranlib", "gcc-ranlib");
env.add_builtin_string("compiler_readelf", "readelf");
env.add_builtin_string("compiler_strip", "strip");
}
env.add_builtin_string("compiler_path", path);
Expand Down
Loading
0