Skip to content

Commit 1e7a032

Browse files
committed
fix: simplify build of cjit-ar
1 parent 10b555d commit 1e7a032

File tree

6 files changed

+9
-19
lines changed

6 files changed

+9
-19
lines changed

GNUmakefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,5 +121,5 @@ debian:
121121
clean: ## 🧹 Clean the source from all built objects
122122
${MAKE} -C lib/tinycc clean distclean
123123
${MAKE} -C src clean
124-
@rm -f cjit cjit.exe cjit.command
124+
@rm -f cjit cjit.exe cjit-ar.exe cjit.command
125125
@rm -rf meson

build/deps.mk

-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
-DVERSION=\"${VERSION}\" \
77
-DCURRENT_YEAR=\"${CURRENT_YEAR}\"
88

9-
.PHONY: rebuild_cjit-ar
10-
rebuild_cjit-ar:
11-
$(cc) $(cflags) -c src/cjit-ar.c -o src/cjit-ar.o
12-
139
lib/tinycc/libtcc.a lib/tinycc/libtcc1.a:
1410
cd lib/tinycc \
1511
&& bash ./configure ${tinycc_config} ${extra_tinycc_config}

build/linux.mk

+2-3
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ cjit: ${SOURCES}
3838
$(cc) $(cflags) -o $@ $(SOURCES) ${ldflags} ${ldadd}
3939

4040
cjit-ar: cflags += -DCJIT_AR_MAIN
41-
cjit-ar: rebuild_cjit-ar
42-
$(cc) $(cflags) -o $@ src/cjit-ar.o ${ldflags} lib/tinycc/libtcc.a
43-
@rm src/src/cjit-ar.o
41+
cjit-ar:
42+
$(cc) $(cflags) -o $@ src/cjit-ar.c ${ldflags} lib/tinycc/libtcc.a
4443

4544
include build/deps.mk

build/osx.mk

+2-4
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ cjit.command: ${SOURCES}
1111
$(cc) $(cflags) -o $@ $(SOURCES) ${ldflags} ${ldadd}
1212

1313
cjit-ar.command: cflags += -DCJIT_AR_MAIN
14-
cjit-ar.command: rebuild_cjit-ar
15-
$(cc) $(cflags) -o $@ src/cjit-ar.o ${ldflags} lib/tinycc/libtcc.a
16-
@rm src/src/cjit-ar.o
17-
14+
cjit-ar.command:
15+
$(cc) $(cflags) -o $@ src/cjit-ar.c ${ldflags} lib/tinycc/libtcc.a
1816

1917
include build/deps.mk

build/win-native.mk

+2-4
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,8 @@ cjit.exe: ${SOURCES}
3232
$(cc) $(cflags) -o $@ $(SOURCES) ${ldflags} ${ldadd}
3333

3434
cjit-ar.exe: cflags += -DCJIT_AR_MAIN
35-
cjit-ar.exe: rebuild_cjit-ar
36-
$(cc) $(cflags) -o $@ src/cjit-ar.o ${ldflags} lib/tinycc/libtcc.a
37-
@rm src/src/cjit-ar.o
38-
35+
cjit-ar.exe:
36+
$(cc) $(cflags) -o $@ src/cjit-ar.c ${ldflags} lib/tinycc/libtcc.a
3937

4038
# libtcc is built by CI
4139

build/win-wsl.mk

+2-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ cjit.exe: ${SOURCES}
2929
$(cc) $(cflags) -o $@ $(SOURCES) cjit.res ${ldflags} ${ldadd}
3030

3131
cjit-ar.exe: cflags += -DCJIT_AR_MAIN
32-
cjit-ar.exe: rebuild_cjit-ar
33-
$(cc) $(cflags) -o $@ src/cjit-ar.o ${ldflags} lib/tinycc/libtcc.a
34-
@rm src/src/cjit-ar.o
32+
cjit-ar.exe:
33+
$(cc) $(cflags) -o $@ src/cjit-ar.c ${ldflags} lib/tinycc/libtcc.a
3534

3635
cross-win:
3736
@cd lib/tinycc && ./configure ${tinycc_config}

0 commit comments

Comments
 (0)