summaryrefslogtreecommitdiff
path: root/user/rust/0030-liblibc-linkage.patch
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2019-04-06 20:22:35 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2019-04-06 20:22:35 +0000
commit7b77e0c080a78c2525e286e41b3721393f79fa8f (patch)
tree2580c195af5f6405fc74b0415211da14a416c39b /user/rust/0030-liblibc-linkage.patch
parent8c2a854351b6ea35aed27d44baff826f400a0497 (diff)
parentfd100f124927cd65cf821bd5d538815e81034c1b (diff)
downloadpackages-7b77e0c080a78c2525e286e41b3721393f79fa8f.tar.gz
packages-7b77e0c080a78c2525e286e41b3721393f79fa8f.tar.bz2
packages-7b77e0c080a78c2525e286e41b3721393f79fa8f.tar.xz
packages-7b77e0c080a78c2525e286e41b3721393f79fa8f.zip
Merge branch 'rust' into 'master'
user/rust: Bump to 1.33.0 See merge request !205
Diffstat (limited to 'user/rust/0030-liblibc-linkage.patch')
-rw-r--r--user/rust/0030-liblibc-linkage.patch17
1 files changed, 0 insertions, 17 deletions
diff --git a/user/rust/0030-liblibc-linkage.patch b/user/rust/0030-liblibc-linkage.patch
deleted file mode 100644
index 4daa0e48f..000000000
--- a/user/rust/0030-liblibc-linkage.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/liblibc/src/unix/mod.rs b/src/liblibc/src/unix/mod.rs
-index 9c68178a..1ae270e9 100644
---- a/src/liblibc/src/unix/mod.rs
-+++ b/src/liblibc/src/unix/mod.rs
-@@ -287,11 +287,7 @@ cfg_if! {
- // cargo build, don't pull in anything extra as the libstd dep
- // already pulls in all libs.
- } else if #[cfg(target_env = "musl")] {
-- #[cfg_attr(feature = "stdbuild",
-- link(name = "c", kind = "static",
-- cfg(target_feature = "crt-static")))]
-- #[cfg_attr(feature = "stdbuild",
-- link(name = "c", cfg(not(target_feature = "crt-static"))))]
-+ #[link(name = "c")]
- extern {}
- } else if #[cfg(target_os = "emscripten")] {
- #[link(name = "c")]