dynmusl targets: drop need_rpath option (alpine-specific for now)

kaniini · kaniini · commit 576e50f8899c · 2021-02-26T17:16:56.000Z
diff --git a/compiler/rustc_target/src/spec/aarch64_unknown_linux_dynmusl.rs b/compiler/rustc_target/src/spec/aarch64_unknown_linux_dynmusl.rs
@@ -6,7 +6,6 @@ pub fn target() -> Target {
     base.llvm_target = "aarch64-unknown-linux-musl".to_string();
     base.options.crt_static_default = false;
     base.options.static_position_independent_executables = true;
-    base.options.need_rpath = true;
 
     base
 }
diff --git a/compiler/rustc_target/src/spec/armv6_unknown_linux_dynmusleabihf.rs b/compiler/rustc_target/src/spec/armv6_unknown_linux_dynmusleabihf.rs
@@ -6,7 +6,6 @@ pub fn target() -> Target {
     base.llvm_target = "armv6-unknown-linux-musleabihf".to_string();
     base.options.crt_static_default = false;
     base.options.static_position_independent_executables = true;
-    base.options.need_rpath = true;
 
     base
 }
diff --git a/compiler/rustc_target/src/spec/armv7_unknown_linux_dynmusleabihf.rs b/compiler/rustc_target/src/spec/armv7_unknown_linux_dynmusleabihf.rs
@@ -6,7 +6,6 @@ pub fn target() -> Target {
     base.llvm_target = "armv7-unknown-linux-musleabihf".to_string();
     base.options.crt_static_default = false;
     base.options.static_position_independent_executables = true;
-    base.options.need_rpath = true;
 
     base
 }
diff --git a/compiler/rustc_target/src/spec/i586_unknown_linux_dynmusl.rs b/compiler/rustc_target/src/spec/i586_unknown_linux_dynmusl.rs
@@ -5,10 +5,8 @@ pub fn target() -> Target {
 
     base.options.cpu = "pentium4".to_string();
     base.llvm_target = "i586-unknown-linux-musl".to_string();
-    base.options.vendor = "alpine".to_string();
     base.options.crt_static_default = false;
     base.options.static_position_independent_executables = true;
-    base.options.need_rpath = true;
 
     base
 }
diff --git a/compiler/rustc_target/src/spec/mips64_unknown_linux_dynmuslabi64.rs b/compiler/rustc_target/src/spec/mips64_unknown_linux_dynmuslabi64.rs
@@ -6,7 +6,6 @@ pub fn target() -> Target {
     base.llvm_target = "mips64-unknown-linux-musl".to_string();
     base.options.crt_static_default = false;
     base.options.static_position_independent_executables = true;
-    base.options.need_rpath = true;
 
     base
 }
diff --git a/compiler/rustc_target/src/spec/mips64el_unknown_linux_dynmuslabi64.rs b/compiler/rustc_target/src/spec/mips64el_unknown_linux_dynmuslabi64.rs
@@ -6,7 +6,6 @@ pub fn target() -> Target {
     base.llvm_target = "mips64el-unknown-linux-musl".to_string();
     base.options.crt_static_default = false;
     base.options.static_position_independent_executables = true;
-    base.options.need_rpath = true;
 
     base
 }
diff --git a/compiler/rustc_target/src/spec/mips_unknown_linux_dynmusl.rs b/compiler/rustc_target/src/spec/mips_unknown_linux_dynmusl.rs
@@ -6,7 +6,6 @@ pub fn target() -> Target {
     base.llvm_target = "mips-unknown-linux-musl".to_string();
     base.options.crt_static_default = false;
     base.options.static_position_independent_executables = true;
-    base.options.need_rpath = true;
 
     base
 }
diff --git a/compiler/rustc_target/src/spec/mipsel_unknown_linux_dynmusl.rs b/compiler/rustc_target/src/spec/mipsel_unknown_linux_dynmusl.rs
@@ -6,7 +6,6 @@ pub fn target() -> Target {
     base.llvm_target = "mipsel-unknown-linux-musl".to_string();
     base.options.crt_static_default = false;
     base.options.static_position_independent_executables = true;
-    base.options.need_rpath = true;
 
     base
 }
diff --git a/compiler/rustc_target/src/spec/powerpc64_unknown_linux_dynmusl.rs b/compiler/rustc_target/src/spec/powerpc64_unknown_linux_dynmusl.rs
@@ -6,7 +6,6 @@ pub fn target() -> Target {
     base.llvm_target = "powerpc64-unknown-linux-musl".to_string();
     base.options.crt_static_default = false;
     base.options.static_position_independent_executables = true;
-    base.options.need_rpath = true;
 
     base
 }
diff --git a/compiler/rustc_target/src/spec/powerpc64le_unknown_linux_dynmusl.rs b/compiler/rustc_target/src/spec/powerpc64le_unknown_linux_dynmusl.rs
@@ -6,7 +6,6 @@ pub fn target() -> Target {
     base.llvm_target = "powerpc64le-unknown-linux-musl".to_string();
     base.options.crt_static_default = false;
     base.options.static_position_independent_executables = true;
-    base.options.need_rpath = true;
 
     base
 }
diff --git a/compiler/rustc_target/src/spec/powerpc_unknown_linux_dynmusl.rs b/compiler/rustc_target/src/spec/powerpc_unknown_linux_dynmusl.rs
@@ -6,7 +6,6 @@ pub fn target() -> Target {
     base.llvm_target = "powerpc-unknown-linux-musl".to_string();
     base.options.crt_static_default = false;
     base.options.static_position_independent_executables = true;
-    base.options.need_rpath = true;
 
     base
 }
diff --git a/compiler/rustc_target/src/spec/s390x_unknown_linux_dynmusl.rs b/compiler/rustc_target/src/spec/s390x_unknown_linux_dynmusl.rs
@@ -6,7 +6,6 @@ pub fn target() -> Target {
     base.llvm_target = "s390x-unknown-linux-musl".to_string();
     base.options.crt_static_default = false;
     base.options.static_position_independent_executables = true;
-    base.options.need_rpath = true;
 
     base
 }
diff --git a/compiler/rustc_target/src/spec/x86_64_unknown_linux_dynmusl.rs b/compiler/rustc_target/src/spec/x86_64_unknown_linux_dynmusl.rs
@@ -6,7 +6,6 @@ pub fn target() -> Target {
     base.llvm_target = "x86_64-unknown-linux-musl".to_string();
     base.options.crt_static_default = false;
     base.options.static_position_independent_executables = true;
-    base.options.need_rpath = true;
 
     base
 }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ pub fn target() -> Target {`
`6`	`6`	`base.llvm_target = "aarch64-unknown-linux-musl".to_string();`
`7`	`7`	`base.options.crt_static_default = false;`
`8`	`8`	`base.options.static_position_independent_executables = true;`
`9`		`- base.options.need_rpath = true;`
`10`	`9`
`11`	`10`	`base`
`12`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ pub fn target() -> Target {`
`6`	`6`	`base.llvm_target = "armv6-unknown-linux-musleabihf".to_string();`
`7`	`7`	`base.options.crt_static_default = false;`
`8`	`8`	`base.options.static_position_independent_executables = true;`
`9`		`- base.options.need_rpath = true;`
`10`	`9`
`11`	`10`	`base`
`12`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ pub fn target() -> Target {`
`6`	`6`	`base.llvm_target = "armv7-unknown-linux-musleabihf".to_string();`
`7`	`7`	`base.options.crt_static_default = false;`
`8`	`8`	`base.options.static_position_independent_executables = true;`
`9`		`- base.options.need_rpath = true;`
`10`	`9`
`11`	`10`	`base`
`12`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,8 @@ pub fn target() -> Target {`
`5`	`5`
`6`	`6`	`base.options.cpu = "pentium4".to_string();`
`7`	`7`	`base.llvm_target = "i586-unknown-linux-musl".to_string();`
`8`		`- base.options.vendor = "alpine".to_string();`
`9`	`8`	`base.options.crt_static_default = false;`
`10`	`9`	`base.options.static_position_independent_executables = true;`
`11`		`- base.options.need_rpath = true;`
`12`	`10`
`13`	`11`	`base`
`14`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ pub fn target() -> Target {`
`6`	`6`	`base.llvm_target = "mips64-unknown-linux-musl".to_string();`
`7`	`7`	`base.options.crt_static_default = false;`
`8`	`8`	`base.options.static_position_independent_executables = true;`
`9`		`- base.options.need_rpath = true;`
`10`	`9`
`11`	`10`	`base`
`12`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ pub fn target() -> Target {`
`6`	`6`	`base.llvm_target = "mips64el-unknown-linux-musl".to_string();`
`7`	`7`	`base.options.crt_static_default = false;`
`8`	`8`	`base.options.static_position_independent_executables = true;`
`9`		`- base.options.need_rpath = true;`
`10`	`9`
`11`	`10`	`base`
`12`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ pub fn target() -> Target {`
`6`	`6`	`base.llvm_target = "mips-unknown-linux-musl".to_string();`
`7`	`7`	`base.options.crt_static_default = false;`
`8`	`8`	`base.options.static_position_independent_executables = true;`
`9`		`- base.options.need_rpath = true;`
`10`	`9`
`11`	`10`	`base`
`12`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ pub fn target() -> Target {`
`6`	`6`	`base.llvm_target = "mipsel-unknown-linux-musl".to_string();`
`7`	`7`	`base.options.crt_static_default = false;`
`8`	`8`	`base.options.static_position_independent_executables = true;`
`9`		`- base.options.need_rpath = true;`
`10`	`9`
`11`	`10`	`base`
`12`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ pub fn target() -> Target {`
`6`	`6`	`base.llvm_target = "powerpc64-unknown-linux-musl".to_string();`
`7`	`7`	`base.options.crt_static_default = false;`
`8`	`8`	`base.options.static_position_independent_executables = true;`
`9`		`- base.options.need_rpath = true;`
`10`	`9`
`11`	`10`	`base`
`12`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ pub fn target() -> Target {`
`6`	`6`	`base.llvm_target = "powerpc64le-unknown-linux-musl".to_string();`
`7`	`7`	`base.options.crt_static_default = false;`
`8`	`8`	`base.options.static_position_independent_executables = true;`
`9`		`- base.options.need_rpath = true;`
`10`	`9`
`11`	`10`	`base`
`12`	`11`	`}`