Adjusted configure host_os to use uname for Darwin 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.

Raphael Cohn committed 11 years ago

Commit 2ba75421 parent fa0eff92 files · +11 −2Browse files

Unified · Split

2 files

Makefile +10 −1
configure +1 −1

@@ -142,11 +142,18 @@ LIBTCC1_CROSS=lib/i386-win/libtcc1.a lib/x86_64-win/libtcc1.a lib/i386/libtcc1.a · 141 unmodified lines
142	142	LIBTCC1=libtcc1.a
143	143	BCHECK=yes
144	144	else ifeq ($(ARCH),x86-64)
	145	+ifeq ($(TARGETOS),Darwin)
	146	+NATIVE_FILES=$(X86_64_FILES)
	147	+PROGS_CROSS=$($(I386_CROSS)_LINK) $($(WIN32_CROSS)_LINK) $($(WIN64_CROSS)_LINK) $(ARM_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS)
	148	+LIBTCC1_CROSS=lib/i386-win/libtcc1.a lib/x86_64-win/libtcc1.a lib/i386/libtcc1.a lib/x86_64/libtcc1.a
	149	+LIBTCC1=libtcc1.a
	150	+else
145	151	NATIVE_FILES=$(X86_64_FILES)
146		−PROGS_CROSS=$($(I386_CROSS)_LINK) $($(WIN32_CROSS)_LINK) $($(WIN64_CROSS)_LINK) $(ARM_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS)
	152	+PROGS_CROSS=$($(I386_CROSS)_LINK) $($(WIN32_CROSS)_LINK) $($(WIN64_CROSS)_LINK) $(ARM_CROSS) $(C67_CROSS) $(WINCE_CROSS)
147	153	LIBTCC1_CROSS=lib/i386-win/libtcc1.a lib/x86_64-win/libtcc1.a lib/i386/libtcc1.a lib/x86_64/libtcc1.a \
148	154	lib/arm64/libtcc1.a
149	155	LIBTCC1=libtcc1.a
	156	+endif
150	157	else ifeq ($(ARCH),arm)
151	158	NATIVE_FILES=$(ARM_FILES)
152	159	PROGS_CROSS=$(I386_CROSS) $(X64_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS)
@@ -305,8 +312,10 @@ ifdef CONFIG_CROSS · 152 unmodified lines
305	312	mkdir -p "$(tccdir)/win32/lib/64"
306	313	mkdir -p "$(tccdir)/i386"
307	314	mkdir -p "$(tccdir)/x86-64"
	315	+ifneq ($(TARGETOS),Darwin)
308	316	mkdir -p "$(tccdir)/arm64"
309	317	$(INSTALL) -m644 lib/arm64/libtcc1.a "$(tccdir)/arm64"
	318	+endif
310	319	$(INSTALL) -m644 lib/i386/libtcc1.a "$(tccdir)/i386"
311	320	$(INSTALL) -m644 lib/i386/bcheck.o "$(tccdir)/i386"
312	321	$(INSTALL) -m644 lib/x86_64/libtcc1.a "$(tccdir)/x86-64"

configure+1−1

@@ -47,7 +47,7 @@ tcc_elfinterp="" · 46 unmodified lines
47	47	tcc_lddir=
48	48	confvars=
49	49	cpu=
50		−host_os=Linux
	50	+host_os=`uname`
51	51
52	52	# OS specific
53	53	targetos=`uname`

Adjusted configure host_os to use uname for Darwin 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.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code