diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-12-24 23:47:35 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-03 23:21:36 +0100 |
| commit | 01c7d4c51c7dc3e15f2feedfffc05a8cb85cb5a3 (patch) | |
| tree | 8d3ebc0d6c11b56a90e6ac5a80c4d763d91379e4 | |
| parent | 0b38e3e62df25a89db98e101e530edf1a4316cd3 (diff) | |
New cdist/arm64 fixes.
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | cscript | 32 | ||||
| -rw-r--r-- | toolchain/osx.cmake | 2 |
3 files changed, 33 insertions, 4 deletions
@@ -49,6 +49,9 @@ osx: osx32: $(call generate_common,$@,-DCMAKE_OSX_ARCHITECTURES=i386) +osx-arm64: + $(call generate_common,$@) + cortex-m0: $(call generate_common,$@) @@ -17,6 +17,31 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # +def make_toolchain(filename, arch, sdk_prefix, sdk): + with open(filename, 'w') as f: + flags = "-arch %s" % arch + print("set(CMAKE_SYSTEM_NAME Darwin)", file=f) + print("set(CMAKE_SYSTEM_PROCESSOR %s)" % arch, file=f) + print("set(CMAKE_C_COMPILER gcc)", file=f) + print("set(CMAKE_CXX_COMPILER g++)", file=f) + print("set(AS as)", file=f) + print("set(AR as)", file=f) + print("set(OBJCOPY objcopy)", file=f) + print("set(OBJDUMP objdump)", file=f) + print("set(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX})", file=f) + print("set(CMAKE_OSX_SYSROOT %s/MacOSX%s.sdk)" % (sdk_prefix, sdk), file=f) + print('set(CMAKE_C_FLAGS "-std=gnu99 -fdata-sections -ffunction-sections %s" CACHE INTERNAL "c compiler flags")' % flags, file=f) + print('set(CMAKE_CXX_FLAGS "-fdata-sections -ffunction-sections %s" CACHE INTERNAL "cxx compiler flags")' % flags, file=f) + print('set(CMAKE_ASM_FLAGS "" CACHE INTERNAL "asm compiler flags")', file=f) + print('set(CMAKE_EXE_LINKER_FLAGS "-dead_strip" CACHE INTERNAL "exe link flags")', file=f) + print('SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -ggdb3" CACHE INTERNAL "c debug compiler flags")', file=f) + print('SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -ggdb3" CACHE INTERNAL "cxx debug compiler flags")', file=f) + print('SET(CMAKE_ASM_FLAGS_DEBUG "-g -ggdb3" CACHE INTERNAL "asm debug compiler flags")', file=f) + print('SET(CMAKE_C_FLAGS_RELEASE "-O2 -g -ggdb3" CACHE INTERNAL "c release compiler flags")', file=f) + print('SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -g -ggdb3" CACHE INTERNAL "cxx release compiler flags")', file=f) + print('SET(CMAKE_ASM_FLAGS_RELEASE "" CACHE INTERNAL "asm release compiler flags")', file=f) + + def build(target, options): if target.platform == 'linux': type = 'generic' @@ -25,10 +50,11 @@ def build(target, options): device = 'dev' target.command('CFLAGS=-fPIC cmake .') elif target.platform == 'osx': - if target.bits == 64: + if target.arch == 'x86_64': type = 'osx' - else: - type = 'osx32' + elif target.arch == 'arm64': + type = 'osx-arm64' + make_toolchain('toolchain/%s.cmake' % type, target.arch, target.sdk_prefix, target.sdk) blockdev = 'linux' ext = 'dylib' device = 'dev' diff --git a/toolchain/osx.cmake b/toolchain/osx.cmake index c920710..a699ca1 100644 --- a/toolchain/osx.cmake +++ b/toolchain/osx.cmake @@ -1,6 +1,6 @@ # Name of the target set(CMAKE_SYSTEM_NAME Darwin) -set(CMAKE_SYSTEM_PROCESSOR i386) +set(CMAKE_SYSTEM_PROCESSOR x86_64) # Toolchain settings set(CMAKE_C_COMPILER gcc) |