Skip to content

Commit 93fa2cf

Browse files
authored
Merge pull request #72 from Mic92/merge-nix-ld-rs
Merge nix-ld-rs
2 parents bf5aa84 + 4468d17 commit 93fa2cf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+3854
-1235
lines changed

.cargo/config

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[build]
2+
rustflags = ["-C", "relocation-model=pie", "-Z", "plt=yes"]
3+
4+
[target.'cfg(target_arch = "aarch64")']
5+
rustflags = [
6+
"-C", "relocation-model=pie", "-Z", "plt=yes",
7+
8+
# <https://github.com/rust-lang/rust/issues/109064> :/
9+
"-C", "target-feature=-outline-atomics",
10+
]

.envrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
if ! has nix_direnv_version || ! nix_direnv_version 2.1.1; then
2+
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.1.1/direnvrc" "sha256-b6qJ4r34rbE23yWjMqbmu3ia2z4b2wIlZUksBke/ol0="
3+
fi
4+
5+
use_flake

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
vendor/nolibc/* linguist-vendored

.gitignore

Lines changed: 10 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,17 @@
1-
/examples/zoom
2-
/examples/master-pdf-editor
3-
/build
4-
# Prerequisites
5-
*.d
1+
.direnv
2+
.vscode
63

7-
# Object files
8-
*.o
9-
*.ko
10-
*.obj
11-
*.elf
12-
13-
# Linker output
14-
*.ilk
15-
*.map
16-
*.exp
4+
result*
175

18-
# Precompiled Headers
19-
*.gch
20-
*.pch
6+
*.o
7+
*.so
8+
*.out
219

22-
# Libraries
23-
*.lib
24-
*.a
25-
*.la
26-
*.lo
10+
*~
11+
*.swp
2712

28-
# Shared objects (inc. Windows DLLs)
29-
*.dll
30-
*.so
31-
*.so.*
32-
*.dylib
3313

34-
# Executables
35-
*.exe
36-
*.out
37-
*.app
38-
*.i*86
39-
*.x86_64
40-
*.hex
4114

42-
# Debug files
43-
*.dSYM/
44-
*.su
45-
*.idb
46-
*.pdb
15+
# Added by cargo
4716

48-
# Kernel Module Compile Results
49-
*.mod*
50-
*.cmd
51-
.tmp_versions/
52-
modules.order
53-
Module.symvers
54-
Mkfile.old
55-
dkms.conf
17+
/target

.mergify.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ pull_request_rules:
1313
- base=main
1414
- label~=merge-queue|dependencies
1515
actions:
16-
queue: {}
16+
queue:

0 commit comments

Comments
 (0)