d0p1/tcc-stupidos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adjusted configure host_os to use uname for Darwin

Browse source 
Adjusted Makefile to make it Darwin (Mac OS X 10.10)-friendly for cross-compilers
by removing the creation of arm64 cross-compilers on this platform.
This commit is contained in:
Raphael Cohn 2015-04-07 15:28:31 +01:00
parent fa0eff949d
commit 2ba7542e4b
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Makefile
View file

@ -142,11 +142,18 @@ LIBTCC1_CROSS=lib/i386-win/libtcc1.a lib/x86_64-win/libtcc1.a lib/i386/libtcc1.a
LIBTCC1=libtcc1.a LIBTCC1=libtcc1.a
BCHECK=yes BCHECK=yes
else ifeq ($(ARCH),x86-64) else ifeq ($(ARCH),x86-64)
ifeq ($(TARGETOS),Darwin)
NATIVE_FILES=$(X86_64_FILES) NATIVE_FILES=$(X86_64_FILES)
PROGS_CROSS=$($(I386_CROSS)_LINK) $($(WIN32_CROSS)_LINK) $($(WIN64_CROSS)_LINK) $(ARM_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS) PROGS_CROSS=$($(I386_CROSS)_LINK) $($(WIN32_CROSS)_LINK) $($(WIN64_CROSS)_LINK) $(ARM_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS)
LIBTCC1_CROSS=lib/i386-win/libtcc1.a lib/x86_64-win/libtcc1.a lib/i386/libtcc1.a lib/x86_64/libtcc1.a
LIBTCC1=libtcc1.a
else
NATIVE_FILES=$(X86_64_FILES)
PROGS_CROSS=$($(I386_CROSS)_LINK) $($(WIN32_CROSS)_LINK) $($(WIN64_CROSS)_LINK) $(ARM_CROSS) $(C67_CROSS) $(WINCE_CROSS)
LIBTCC1_CROSS=lib/i386-win/libtcc1.a lib/x86_64-win/libtcc1.a lib/i386/libtcc1.a lib/x86_64/libtcc1.a \ LIBTCC1_CROSS=lib/i386-win/libtcc1.a lib/x86_64-win/libtcc1.a lib/i386/libtcc1.a lib/x86_64/libtcc1.a \
lib/arm64/libtcc1.a lib/arm64/libtcc1.a
LIBTCC1=libtcc1.a LIBTCC1=libtcc1.a
endif
else ifeq ($(ARCH),arm) else ifeq ($(ARCH),arm)
NATIVE_FILES=$(ARM_FILES) NATIVE_FILES=$(ARM_FILES)
PROGS_CROSS=$(I386_CROSS) $(X64_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS) PROGS_CROSS=$(I386_CROSS) $(X64_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS)
@ -305,8 +312,10 @@ ifdef CONFIG_CROSS
mkdir -p "$(tccdir)/win32/lib/64" mkdir -p "$(tccdir)/win32/lib/64"
mkdir -p "$(tccdir)/i386" mkdir -p "$(tccdir)/i386"
mkdir -p "$(tccdir)/x86-64" mkdir -p "$(tccdir)/x86-64"
ifneq ($(TARGETOS),Darwin)
mkdir -p "$(tccdir)/arm64" mkdir -p "$(tccdir)/arm64"
$(INSTALL) -m644 lib/arm64/libtcc1.a "$(tccdir)/arm64" $(INSTALL) -m644 lib/arm64/libtcc1.a "$(tccdir)/arm64"
endif
$(INSTALL) -m644 lib/i386/libtcc1.a "$(tccdir)/i386" $(INSTALL) -m644 lib/i386/libtcc1.a "$(tccdir)/i386"
$(INSTALL) -m644 lib/i386/bcheck.o "$(tccdir)/i386" $(INSTALL) -m644 lib/i386/bcheck.o "$(tccdir)/i386"
$(INSTALL) -m644 lib/x86_64/libtcc1.a "$(tccdir)/x86-64" $(INSTALL) -m644 lib/x86_64/libtcc1.a "$(tccdir)/x86-64"

2
configure vendored
View file

@ -47,7 +47,7 @@ tcc_elfinterp=""
tcc_lddir= tcc_lddir=
confvars= confvars=
cpu= cpu=
host_os=Linux host_os=`uname`
# OS specific # OS specific
targetos=`uname` targetos=`uname`