aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorgrischka <grischka>2016-10-17 23:22:21 +0200
committergrischka <grischka>2016-10-17 23:24:10 +0200
commit02919cd27506e25dacdbe72dad1ae2718eb75991 (patch)
tree413aa1d0994dc92f74605ce5906bec2e39687596 /lib
parent0be098929a062d706057d7beb78666daa52bac49 (diff)
downloadtinycc-02919cd27506e25dacdbe72dad1ae2718eb75991.tar.gz
tinycc-02919cd27506e25dacdbe72dad1ae2718eb75991.tar.bz2
configure: --triplet= option, Makefile: cleanup
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 9b4a884..e61437e 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -41,22 +41,21 @@ cross : TCC = $(TOP)/$(TARGET)-tcc$(EXESUF)
I386_O = libtcc1.o alloca86.o alloca86-bt.o $(BCHECK_O)
X86_64_O = libtcc1.o alloca86_64.o alloca86_64-bt.o $(BCHECK_O)
ARM_O = libtcc1.o armeabi.o alloca-arm.o
-WIN32_O = $(I386_O) crt1.o wincrt1.o dllcrt1.o dllmain.o chkstk.o
-WIN64_O = $(X86_64_O) crt1.o wincrt1.o dllcrt1.o dllmain.o chkstk.o
ARM64_O = lib-arm64.o
+WIN32_O = crt1.o wincrt1.o dllcrt1.o dllmain.o chkstk.o
# build TCC runtime library to contain PIC code, so it can be linked
# into shared libraries
PICFLAGS = -fPIC
ifeq "$(TARGET)" "i386-win32"
- OBJ = $(addprefix $(DIR)/,$(WIN32_O))
+ OBJ = $(addprefix $(DIR)/,$(I386_O) $(WIN32_O))
TGT = -DTCC_TARGET_I386 -DTCC_TARGET_PE
XCC = $(TCC) -B$(TOPSRC)/win32 -I$(TOPSRC)/include
XAR = $(DIR)/tiny_libmaker$(EXESUF)
XFLAGS = $(TGT)
else ifeq "$(TARGET)" "x86_64-win32"
- OBJ = $(addprefix $(DIR)/,$(WIN64_O))
+ OBJ = $(addprefix $(DIR)/,$(X86_64_O) $(WIN32_O))
TGT = -DTCC_TARGET_X86_64 -DTCC_TARGET_PE
XCC = $(TCC) -B$(TOPSRC)/win32 -I$(TOPSRC)/include
XAR = $(DIR)/tiny_libmaker$(EXESUF)
@@ -110,4 +109,4 @@ $(OBJ) $(XAR) : $(DIR)/exists
@echo $@ > $@
clean :
- rm -rfv i386-win32 x86_64-win32 i386 x86_64 arm arm64
+ rm -rf i386-win32 x86_64-win32 i386 x86_64 arm arm64