diff options
| author | Raphael Cohn <raphael.cohn@stormmq.com> | 2015-04-07 15:28:31 +0100 |
|---|---|---|
| committer | Raphael Cohn <raphael.cohn@stormmq.com> | 2015-04-07 15:44:54 +0100 |
| commit | 2ba7542e4b806828cc2aa3ff4b0460e6a821137c (patch) | |
| tree | dbfc6003e974c8f4823d85e6cde999659eaf0d45 /Makefile | |
| parent | fa0eff949d7eed47494f630e8154114e00cc57a6 (diff) | |
| download | tinycc-2ba7542e4b806828cc2aa3ff4b0460e6a821137c.tar.gz tinycc-2ba7542e4b806828cc2aa3ff4b0460e6a821137c.tar.bz2 | |
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.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -142,11 +142,18 @@ LIBTCC1_CROSS=lib/i386-win/libtcc1.a lib/x86_64-win/libtcc1.a lib/i386/libtcc1.a 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) @@ -305,8 +312,10 @@ ifdef CONFIG_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" |