Skip to content

Commit ff4e43c

Browse files
committed
trimming: Remove init.c from test
This accidentally diverged when #58141 was merged without adjusting the test to match (these tests shouldn't be re-implementing the `juliac` link step anyway, but they currently do) Unfortunately, this hid a bug where `jl_pathname_for_handle` does not understand the main executable.
1 parent 75ba594 commit ff4e43c

File tree

2 files changed

+5
-19
lines changed

2 files changed

+5
-19
lines changed

test/trimming/Makefile

+5-8
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,21 @@ release: hello$(EXE) basic_jll$(EXE)
3535
hello-o.a: $(SRCDIR)/hello.jl $(BUILDSCRIPT)
3636
$(JULIA) -t 1 -J $(BIN)/../lib/julia/sys.$(SHLIB_EXT) --startup-file=no --history-file=no --output-o $@ --output-incremental=no --strip-ir --strip-metadata --experimental --trim $(BUILDSCRIPT) $< --output-exe true
3737

38-
init.o: $(SRCDIR)/init.c
39-
$(CC) -c -o $@ $< $(CPPFLAGS_ADD) $(CPPFLAGS) $(CFLAGS_ADD) $(CFLAGS)
40-
4138
basic_jll-o.a: $(SRCDIR)/basic_jll.jl $(BUILDSCRIPT)
4239
$(JULIA) -t 1 -J $(BIN)/../lib/julia/sys.$(SHLIB_EXT) --startup-file=no --history-file=no --project=$(SRCDIR) -e "using Pkg; Pkg.instantiate()"
4340
$(JULIA) -t 1 -J $(BIN)/../lib/julia/sys.$(SHLIB_EXT) --startup-file=no --history-file=no --project=$(SRCDIR) --output-o $@ --output-incremental=no --strip-ir --strip-metadata --experimental --trim $(BUILDSCRIPT) $< --output-exe true
4441

45-
hello$(EXE): hello-o.a init.o
46-
$(CC) -o $@ $(WHOLE_ARCHIVE) $< $(NO_WHOLE_ARCHIVE) init.o $(CPPFLAGS_ADD) $(CPPFLAGS) $(CFLAGS_ADD) $(CFLAGS) $(LDFLAGS_ADD) $(LDFLAGS)
42+
hello$(EXE): hello-o.a
43+
$(CC) -o $@ $(WHOLE_ARCHIVE) $< $(NO_WHOLE_ARCHIVE) $(CPPFLAGS_ADD) $(CPPFLAGS) $(CFLAGS_ADD) $(CFLAGS) $(LDFLAGS_ADD) $(LDFLAGS)
4744

48-
basic_jll$(EXE): basic_jll-o.a init.o
49-
$(CC) -o $@ $(WHOLE_ARCHIVE) $< $(NO_WHOLE_ARCHIVE) init.o $(CPPFLAGS_ADD) $(CPPFLAGS) $(CFLAGS_ADD) $(CFLAGS) $(LDFLAGS_ADD) $(LDFLAGS)
45+
basic_jll$(EXE): basic_jll-o.a
46+
$(CC) -o $@ $(WHOLE_ARCHIVE) $< $(NO_WHOLE_ARCHIVE) $(CPPFLAGS_ADD) $(CPPFLAGS) $(CFLAGS_ADD) $(CFLAGS) $(LDFLAGS_ADD) $(LDFLAGS)
5047

5148
check: hello$(EXE) basic_jll$(EXE)
5249
$(JULIA) --depwarn=error $(SRCDIR)/../runtests.jl $(SRCDIR)/trimming
5350

5451
clean:
55-
-rm -f hello$(EXE) basic_jll$(EXE) init.o hello-o.a basic_jll-o.a
52+
-rm -f hello$(EXE) basic_jll$(EXE) hello-o.a basic_jll-o.a
5653

5754
.PHONY: release clean check
5855

test/trimming/init.c

-11
This file was deleted.

0 commit comments

Comments
 (0)