Skip to content

Commit 528b5e6

Browse files
committed
Revert "[gn build] Add rules for crtbegin/end (#66012)"
This reverts commit e2e32f0. Breaks bots, e.g. http://45.33.8.238/linux/120748/step_4.txt
1 parent 8e2b2c4 commit 528b5e6

File tree

2 files changed

+1
-36
lines changed

2 files changed

+1
-36
lines changed

llvm/utils/gn/secondary/compiler-rt/lib/BUILD.gn

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ group("lib") {
55
"//compiler-rt/lib/cfi:ignorelist($host_toolchain)",
66
]
77
if (current_os == "linux") {
8-
deps += [
9-
"//compiler-rt/lib/builtins:crt",
10-
"//compiler-rt/lib/msan",
11-
]
8+
deps += [ "//compiler-rt/lib/msan" ]
129
}
1310
if (current_os == "linux" || current_os == "android") {
1411
deps += [ "//compiler-rt/lib/ubsan_minimal" ]

llvm/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -574,38 +574,6 @@ static_library("builtins") {
574574
deps = lse_targets
575575
}
576576

577-
if (current_os == "linux") {
578-
source_set("crt_src") {
579-
sources = [
580-
"crtbegin.c",
581-
"crtend.c",
582-
]
583-
cflags = [
584-
"-std=c11",
585-
"-fPIC",
586-
]
587-
}
588-
copy("crtbegin") {
589-
# TODO: use get_target_outputs if it ever works with source_set to avoid hardcoding crt_src.crtbegin.o
590-
input_dir = get_label_info(":crt_src", "target_out_dir")
591-
sources = [ "$input_dir/crt_src.crtbegin.o" ]
592-
outputs = [ "$crt_current_out_dir/clang_rt.crtbegin.o" ]
593-
deps = [ ":crt_src" ]
594-
}
595-
copy("crtend") {
596-
input_dir = get_label_info(":crt_src", "target_out_dir")
597-
sources = [ "$input_dir/crt_src.crtend.o" ]
598-
outputs = [ "$crt_current_out_dir/clang_rt.crtend.o" ]
599-
deps = [ ":crt_src" ]
600-
}
601-
group("crt") {
602-
deps = [
603-
":crtbegin",
604-
":crtend",
605-
]
606-
}
607-
}
608-
609577
# Currently unused but necessary to make sync_source_lists_from_cmake.py happy.
610578
source_set("_unused") {
611579
sources = [

0 commit comments

Comments
 (0)