Adjust path to crtbegin.c / crtend.c

nikic · nikic · commit 5be397441ee0 · 2023-08-07T20:35:55.000+02:00
These were moved into builtins by https://reviews.llvm.org/D153989.
diff --git a/src/bootstrap/llvm.rs b/src/bootstrap/llvm.rs
@@ -1159,8 +1159,8 @@ impl Step for CrtBeginEnd {
             return out_dir;
         }
 
-        let crtbegin_src = builder.src.join("src/llvm-project/compiler-rt/lib/crt/crtbegin.c");
-        let crtend_src = builder.src.join("src/llvm-project/compiler-rt/lib/crt/crtend.c");
+        let crtbegin_src = builder.src.join("src/llvm-project/compiler-rt/lib/builtins/crtbegin.c");
+        let crtend_src = builder.src.join("src/llvm-project/compiler-rt/lib/builtins/crtend.c");
         if up_to_date(&crtbegin_src, &out_dir.join("crtbegin.o"))
             && up_to_date(&crtend_src, &out_dir.join("crtendS.o"))
         {

Original file line number	Diff line number	Diff line change
`@@ -1159,8 +1159,8 @@ impl Step for CrtBeginEnd {`
`1159`	`1159`	`return out_dir;`
`1160`	`1160`	`}`
`1161`	`1161`
`1162`		`- let crtbegin_src = builder.src.join("src/llvm-project/compiler-rt/lib/crt/crtbegin.c");`
`1163`		`- let crtend_src = builder.src.join("src/llvm-project/compiler-rt/lib/crt/crtend.c");`
	`1162`	`+ let crtbegin_src = builder.src.join("src/llvm-project/compiler-rt/lib/builtins/crtbegin.c");`
	`1163`	`+ let crtend_src = builder.src.join("src/llvm-project/compiler-rt/lib/builtins/crtend.c");`
`1164`	`1164`	`if up_to_date(&crtbegin_src, &out_dir.join("crtbegin.o"))`
`1165`	`1165`	`&& up_to_date(&crtend_src, &out_dir.join("crtendS.o"))`
`1166`	`1166`	`{`