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

 LIBTCC1=libtcc1.a
 BCHECK=yes
 else ifeq ($(ARCH),x86-64)
+ifeq ($(TARGETOS),Darwin)
+NATIVE_FILES=$(X86_64_FILES)
+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) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS)
+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 \
     lib/arm64/libtcc1.a
 LIBTCC1=libtcc1.a
+endif
 else ifeq ($(ARCH),arm)
 NATIVE_FILES=$(ARM_FILES)
 PROGS_CROSS=$(I386_CROSS) $(X64_CROSS) $(WIN32_CROSS) $(WIN64_CROSS) $(ARM64_CROSS) $(C67_CROSS) $(WINCE_CROSS)
 	mkdir -p "$(tccdir)/win32/lib/64"
 	mkdir -p "$(tccdir)/i386"
 	mkdir -p "$(tccdir)/x86-64"
+ifneq ($(TARGETOS),Darwin)
 	mkdir -p "$(tccdir)/arm64"
 	$(INSTALL) -m644 lib/arm64/libtcc1.a "$(tccdir)/arm64"
+endif
 	$(INSTALL) -m644 lib/i386/libtcc1.a "$(tccdir)/i386"
 	$(INSTALL) -m644 lib/i386/bcheck.o "$(tccdir)/i386"
 	$(INSTALL) -m644 lib/x86_64/libtcc1.a "$(tccdir)/x86-64"

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

Keyboard shortcuts