Unified · Split
| @@ -128,7 +128,7 @@ ifdef CONFIG_CROSS · 127 unmodified lines | ||
| 128 | 128 | PROGS+=$(PROGS_CROSS) |
| 129 | 129 | # Try to build win32 cross-compiler lib on *nix |
| 130 | 130 | ifndef CONFIG_WIN32 |
| 131 | −LIBTCCLIBS+=LinuxWIN32libtcc1 | |
| 131 | +LIBTCCLIBS+=LinuxWinCrossLibs | |
| 132 | 132 | endif |
| 133 | 133 | endif |
| 134 | 134 | |
| @@ -204,12 +204,12 @@ LIBTCC1_OBJS=libtcc1.o $(ALLOCA_O) · 69 unmodified lines | ||
| 204 | 204 | LIBTCC1_CC=$(CC) |
| 205 | 205 | VPATH+=lib |
| 206 | 206 | |
| 207 | −# use cross-compilers to bootstrap build libtcc1-winxx.a on Linux | |
| 207 | +# use cross-compilers to bootstrap libtcc1-winxx.a on Linux | |
| 208 | 208 | # ar t *.a can list the ELF objects in archive for debugging |
| 209 | −LinuxWIN32libtcc1: $(WIN32_CROSS) $(WIN64_CROSS) | |
| 209 | +LinuxWinCrossLibs: $(WIN32_CROSS) $(WIN64_CROSS) | |
| 210 | 210 | $(MAKE) TCC=$(WIN32_CROSS) LIBTCC1_DIR=win32/lib ARCH=i386 \ |
| 211 | 211 | CONFIG_WIN32=1 LIBTCC1=libtcc1-win32.a ./win32/lib/libtcc1-win32.a |
| 212 | − -rm libtcc1.o crt1.o wincrt1.o dllcrt1.o dllmain.o chkstk.o bcheck.o | |
| 212 | + -rm -f crt1.o wincrt1.o dllcrt1.o dllmain.o chkstk.o bcheck.o | |
| 213 | 213 | $(MAKE) TCC=$(WIN64_CROSS) LIBTCC1_DIR=win32/lib ARCH=x86_64 \ |
| 214 | 214 | CONFIG_WIN64=1 LIBTCC1=libtcc1-win64.a ./win32/lib/libtcc1-win64.a |
| 215 | 215 | |
| @@ -271,7 +271,7 @@ endif · 55 unmodified lines | ||
| 271 | 271 | $(INSTALL) -m644 tcc-doc.html "$(docdir)" |
| 272 | 272 | ifdef CONFIG_CROSS |
| 273 | 273 | mkdir -p "$(tccdir)/lib" |
| 274 | − $(INSTALL) -m644 win32/lib/*.def win32/lib/libtcc1.a "$(tccdir)/lib" | |
| 274 | + $(INSTALL) -m644 win32/lib/*.def win32/lib/libtcc1*.a "$(tccdir)/lib" | |
| 275 | 275 | cp -r win32/include/. "$(tccdir)/include" |
| 276 | 276 | cp -r win32/examples/. "$(tccdir)/examples" |
| 277 | 277 | endif |
| @@ -318,7 +318,7 @@ tcc.1: tcc-doc.texi · 40 unmodified lines | ||
| 318 | 318 | tcc-doc.info: tcc-doc.texi |
| 319 | 319 | makeinfo tcc-doc.texi |
| 320 | 320 | |
| 321 | −.PHONY: all libtest clean tar distclean install uninstall LinuxWIN32libtcc1 | |
| 321 | +.PHONY: all libtest clean tar distclean install uninstall LinuxWinCrossLibs | |
| 322 | 322 | |
| 323 | 323 | # tar release (use 'make -k tar' on a checkouted tree) |
| 324 | 324 | TCC-VERSION=tcc-$(shell cat VERSION) |