Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
redox
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pirson Bethancourt
redox
Commits
150dfc5c
Commit
150dfc5c
authored
8 years ago
by
Jeremy Soller
Browse files
Options
Downloads
Patches
Plain Diff
Add binutils
parent
74a93692
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitmodules
+3
-0
3 additions, 0 deletions
.gitmodules
Makefile
+16
-2
16 additions, 2 deletions
Makefile
programs/binutils
+1
-0
1 addition, 0 deletions
programs/binutils
programs/extrautils
+1
-1
1 addition, 1 deletion
programs/extrautils
with
21 additions
and
3 deletions
.gitmodules
+
3
−
0
View file @
150dfc5c
...
...
@@ -52,3 +52,6 @@
[submodule "libstd_real/openlibm"]
path = libstd/openlibm
url = https://github.com/redox-os/openlibm.git
[submodule "programs/binutils"]
path = programs/binutils
url = https://github.com/redox-os/binutils.git
This diff is collapsed.
Click to expand it.
Makefile
+
16
−
2
View file @
150dfc5c
...
...
@@ -19,7 +19,7 @@ CARGO=RUSTC="$(RUSTC)" RUSTDOC="$(RUSTDOC)" cargo
CARGOFLAGS
=
--target
$(
TARGET
)
.json
--release
--
# Default targets
.PHONY
:
all clean doc ref test update qemu bochs drivers schemes coreutils extrautils netutils userutils wireshark FORCE
.PHONY
:
all clean doc ref test update qemu bochs drivers schemes
binutils
coreutils extrautils netutils userutils wireshark FORCE
all
:
$(KBUILD)/harddrive.bin
...
...
@@ -38,6 +38,7 @@ clean:
cargo clean
--manifest-path
programs/contain/Cargo.toml
cargo clean
--manifest-path
programs/init/Cargo.toml
cargo clean
--manifest-path
programs/ion/Cargo.toml
cargo clean
--manifest-path
programs/binutils/Cargo.toml
cargo clean
--manifest-path
programs/coreutils/Cargo.toml
cargo clean
--manifest-path
programs/extrautils/Cargo.toml
cargo clean
--manifest-path
programs/netutils/Cargo.toml
...
...
@@ -74,6 +75,7 @@ doc-std: $(BUILD)/libstd.rlib FORCE
ref
:
FORCE
rm
-rf
filesystem/ref/
mkdir
-p
filesystem/ref/
cargo run
--manifest-path
crates/docgen/Cargo.toml
--
programs/binutils/src/bin/ filesystem/ref/
cargo run
--manifest-path
crates/docgen/Cargo.toml
--
programs/coreutils/src/bin/ filesystem/ref/
cargo run
--manifest-path
crates/docgen/Cargo.toml
--
programs/extrautils/src/bin/ filesystem/ref/
cargo run
--manifest-path
crates/docgen/Cargo.toml
--
programs/netutils/src/ filesystem/ref/
...
...
@@ -91,6 +93,7 @@ test:
cargo
test
--manifest-path
programs/contain/Cargo.toml
cargo
test
--manifest-path
programs/init/Cargo.toml
cargo
test
--manifest-path
programs/ion/Cargo.toml
cargo
test
--manifest-path
programs/binutils/Cargo.toml
cargo
test
--manifest-path
programs/coreutils/Cargo.toml
cargo
test
--manifest-path
programs/extrautils/Cargo.toml
cargo
test
--manifest-path
programs/netutils/Cargo.toml
...
...
@@ -122,6 +125,7 @@ update:
cargo update
--manifest-path
programs/contain/Cargo.toml
cargo update
--manifest-path
programs/init/Cargo.toml
cargo update
--manifest-path
programs/ion/Cargo.toml
cargo update
--manifest-path
programs/binutils/Cargo.toml
cargo update
--manifest-path
programs/coreutils/Cargo.toml
cargo update
--manifest-path
programs/extrautils/Cargo.toml
cargo update
--manifest-path
programs/netutils/Cargo.toml
...
...
@@ -373,6 +377,12 @@ filesystem/bin/%: programs/%/Cargo.toml programs/%/src/** $(BUILD)/libstd.rlib
filesystem/bin/sh
:
filesystem/bin/ion
cp
$<
$@
filesystem/bin/%
:
programs/binutils/Cargo.toml programs/binutils/src/bin/%.rs $(BUILD)/libstd.rlib
mkdir
-p
filesystem/bin
$(
CARGO
)
rustc
--manifest-path
$<
--bin
$*
$(
CARGOFLAGS
)
-o
$@
strip
$@
rm
$@
.d
filesystem/bin/%
:
programs/coreutils/Cargo.toml programs/coreutils/src/bin/%.rs $(BUILD)/libstd.rlib
mkdir
-p
filesystem/bin
$(
CARGO
)
rustc
--manifest-path
$<
--bin
$*
$(
CARGOFLAGS
)
-o
$@
...
...
@@ -420,6 +430,11 @@ drivers: \
filesystem/bin/e1000d
\
filesystem/bin/rtl8168d
binutils
:
\
filesystem/bin/hex
\
filesystem/bin/hexdump
\
filesystem/bin/strings
coreutils
:
\
filesystem/bin/basename
\
filesystem/bin/cat
\
...
...
@@ -464,7 +479,6 @@ extrautils: \
filesystem/bin/cksum
\
filesystem/bin/cur
\
filesystem/bin/grep
\
filesystem/bin/hexdump
\
filesystem/bin/less
\
filesystem/bin/man
\
filesystem/bin/mdless
\
...
...
This diff is collapsed.
Click to expand it.
binutils
@
5599724e
Subproject commit 5599724eab8b28705f6b2b66145fdcb7e4ce2d4d
This diff is collapsed.
Click to expand it.
extrautils
@
63f27dcc
Compare
b3d8bf61
...
63f27dcc
Subproject commit
b3d8bf61860cd4c7c2263b2798779aa182cab1d6
Subproject commit
63f27dccc12184a4eb73efa0a065fea65650c664
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment