github-repos/tinycc
1
0
Fork 0
mirror of https://github.com/mirror/tinycc.git synced 2025-01-13 05:10:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix a mingw64 build on Linux with --enable-tcc64-mingw

Browse Source 
* define CONFIG_WIN64=yes when ARCH=x86-64 (not CONFIG_WIN32=yes)
    * CONFIG_WIN64 now use a windows install part (not a Linux one)
This commit is contained in:
seyko 2016-05-20 15:48:02 +03:00
parent 824b1b582f
commit 18cbe62e69
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -271,10 +271,17 @@ else
INSTALLBIN=$(INSTALL) INSTALLBIN=$(INSTALL)
endif endif
ifdef CONFIG_WIN32
CONFIG_WIN=yes
endif
ifdef CONFIG_WIN64
CONFIG_WIN=yes
endif
install-strip: install install-strip: install
strip $(foreach PROG,$(PROGS),"$(bindir)"/$(PROG)) strip $(foreach PROG,$(PROGS),"$(bindir)"/$(PROG))
ifndef CONFIG_WIN32 ifndef CONFIG_WIN
install: $(PROGS) $(TCCLIBS) $(TCCDOCS) install: $(PROGS) $(TCCLIBS) $(TCCDOCS)
mkdir -p "$(bindir)" mkdir -p "$(bindir)"
$(INSTALLBIN) -m755 $(PROGS) "$(bindir)" $(INSTALLBIN) -m755 $(PROGS) "$(bindir)"

9
configure vendored
View File

@ -520,8 +520,13 @@ if test "$noldl" = "yes" ; then
echo "CONFIG_NOLDL=yes" >> config.mak echo "CONFIG_NOLDL=yes" >> config.mak
fi fi
if test "$mingw32" = "yes" ; then if test "$mingw32" = "yes" ; then
echo "CONFIG_WIN32=yes" >> config.mak if test "$cpu" = "x86-64"; then
echo "#define CONFIG_WIN32 1" >> $TMPH echo "CONFIG_WIN64=yes" >> config.mak
echo "#define CONFIG_WIN64 1" >> $TMPH
else
echo "CONFIG_WIN32=yes" >> config.mak
echo "#define CONFIG_WIN32 1" >> $TMPH
fi
fi fi
if test "$cygwin" = "yes" ; then if test "$cygwin" = "yes" ; then
echo "#ifndef _WIN32" >> $TMPH echo "#ifndef _WIN32" >> $TMPH

2
lib/Makefile
View File

@ -68,7 +68,7 @@ else
ifeq "$(TARGET)" "x86_64-win" ifeq "$(TARGET)" "x86_64-win"
OBJ = $(addprefix $(DIR)/,$(WIN64_O)) OBJ = $(addprefix $(DIR)/,$(WIN64_O))
TGT = -DTCC_TARGET_X86_64 -DTCC_TARGET_PE TGT = -DTCC_TARGET_X86_64 -DTCC_TARGET_PE
XCC = $(TCC) -B$(top_srcdir)/win32 -I$(top_srcdir)/include XCC ?= $(TCC) -B$(top_srcdir)/win32 -I$(top_srcdir)/include
XAR ?= $(DIR)/tiny_libmaker$(EXESUF) XAR ?= $(DIR)/tiny_libmaker$(EXESUF)
PICFLAGS = PICFLAGS =
else else