From bf2854d2a25718fd52b2162bba46dc01525f0c75 Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme Date: Sat, 4 Jan 2014 21:57:52 +0800 Subject: Use GNU triplet prefix for cross tcc compilers Compatibility symlinks are put in place in case some script were relying on former names except for CMake since it was added after last release. --- Makefile | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9225d82..df1d198 100644 --- a/Makefile +++ b/Makefile @@ -75,18 +75,30 @@ NATIVE_DEFINES += $(NATIVE_DEFINES_yes) ifeq ($(TOP),.) PROGS=tcc$(EXESUF) -I386_CROSS = i386-tcc$(EXESUF) -WIN32_CROSS = i386-win32-tcc$(EXESUF) -WIN64_CROSS = x86_64-win32-tcc$(EXESUF) -WINCE_CROSS = arm-win32-tcc$(EXESUF) -X64_CROSS = x86_64-tcc$(EXESUF) -ARM_FPA_CROSS = arm-fpa-tcc$(EXESUF) -ARM_FPA_LD_CROSS = arm-fpa-ld-tcc$(EXESUF) -ARM_VFP_CROSS = arm-vfp-tcc$(EXESUF) -ARM_EABI_CROSS = arm-eabi-tcc$(EXESUF) +I386_CROSS = i386-linux-gnu-tcc$(EXESUF) +WIN32_CROSS = i386-w64-mingw32-tcc$(EXESUF) +WIN64_CROSS = x86_64-w64-mingw32-tcc$(EXESUF) +WINCE_CROSS = arm-wince-mingw32ce-tcc$(EXESUF) +X64_CROSS = x86_64-linux-gnu-tcc$(EXESUF) +ARM_FPA_CROSS = arm-linux-fpa-tcc$(EXESUF) +ARM_FPA_LD_CROSS = arm-linux-fpa-ld-tcc$(EXESUF) +ARM_VFP_CROSS = arm-linux-gnu-tcc$(EXESUF) +ARM_EABI_CROSS = arm-linux-gnueabi-tcc$(EXESUF) +ARM_EABIHF_CROSS = arm-linux-gnueabihf-tcc$(EXESUF) ARM_CROSS = $(ARM_FPA_CROSS) $(ARM_FPA_LD_CROSS) $(ARM_VFP_CROSS) $(ARM_EABI_CROSS) C67_CROSS = c67-tcc$(EXESUF) +# Legacy symlinks for cross compilers +$(I386_CROSS)_LINK = i386-tcc$(EXESUF) +$(WIN32_CROSS)_LINK = i386-win32-tcc$(EXESUF) +$(WIN64_CROSS)_LINK = x86_64-win32-tcc$(EXESUF) +$(WINCE_CROSS)_LINK = arm-win32-tcc$(EXESUF) +$(X64_CROSS)_LINK = x86_64-tcc$(EXESUF) +$(ARM_FPA_CROSS)_LINK = arm-fpa-tcc$(EXESUF) +$(ARM_FPA_LD_CROSS)_LINK = arm-fpa-ld-tcc$(EXESUF) +$(ARM_VFP_CROSS)_LINK = arm-vfp-tcc$(EXESUF) +$(ARM_EABI_CROSS)_LINK = arm-eabi-tcc$(EXESUF) + CORE_FILES = tcc.c libtcc.c tccpp.c tccgen.c tccelf.c tccasm.c tccrun.c CORE_FILES += tcc.h config.h libtcc.h tcctok.h I386_FILES = $(CORE_FILES) i386-gen.c i386-asm.c i386-asm.h i386-tok.h @@ -124,6 +136,7 @@ NATIVE_FILES=$(ARM_FILES) PROGS_CROSS=$(I386_CROSS) $(X64_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(C67_CROSS) LIBTCC1=libtcc1.a endif +PROGS_CROSS_LINK=$(foreach PROG_CROSS,$(PROGS_CROSS),$($(PROG_CROSS)_LINK)) ifeq ($(TARGETOS),Darwin) PROGS+=tiny_libmaker$(EXESUF) @@ -150,6 +163,7 @@ tcc$(EXESUF): tcc.o $(LIBTCC) # Cross Tiny C Compilers %-tcc$(EXESUF): tcc.c $(CC) -o $@ $< -DONE_SOURCE $(DEFINES) $(CPPFLAGS) $(CFLAGS) $(LIBS) $(LDFLAGS) + $(if $($@_LINK),ln -sf $@ $($@_LINK)) # profiling version tcc_p$(EXESUF): $(NATIVE_FILES) @@ -237,7 +251,7 @@ ifndef CONFIG_WIN32 install: $(PROGS) $(TCCLIBS) $(TCCDOCS) mkdir -p "$(bindir)" ifeq ($(CC),tcc) - $(INSTALL) -m755 $(PROGS) "$(bindir)" + $(INSTALL) -m755 $(PROGS) $(PROGS_CROSS_LINK) "$(bindir)" else $(INSTALLBIN) -m755 $(PROGS) "$(bindir)" endif -- cgit v1.3.1