diff options
| author | serpilliere <serpilliere@users.noreply.github.com> | 2019-05-25 23:59:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-25 23:59:11 +0200 |
| commit | 4adc8f10a5561d9d2bd460e6595bec04e11d332c (patch) | |
| tree | cb86ef446777966ae57e9a19f59c225bc0dcd46c | |
| parent | 78bfeedcc028df9f2e43f26a3c522bc3341ebe61 (diff) | |
| parent | 3ece45639f6ffd604d5350987cf90a48384c3170 (diff) | |
| download | miasm-4adc8f10a5561d9d2bd460e6595bec04e11d332c.tar.gz miasm-4adc8f10a5561d9d2bd460e6595bec04e11d332c.zip | |
Merge pull request #1044 from icecr4ck/fix_macos_jitter
Fix jitter on macOS
Diffstat (limited to '')
| -rw-r--r-- | miasm/jitter/vm_mngr.h | 6 | ||||
| -rw-r--r--[-rwxr-xr-x] | setup.py | 13 |
2 files changed, 15 insertions, 4 deletions
diff --git a/miasm/jitter/vm_mngr.h b/miasm/jitter/vm_mngr.h index e7d0c123..35a648a5 100644 --- a/miasm/jitter/vm_mngr.h +++ b/miasm/jitter/vm_mngr.h @@ -35,10 +35,8 @@ #ifdef __APPLE__ #define __BYTE_ORDER __BYTE_ORDER__ -#ifndef __BIG_ENDIAN -#define __BIG_ENDIAN '>' -#define __LITTLE_ENDIAN '<' -#endif +#define __BIG_ENDIAN BIG_ENDIAN +#define __LITTLE_ENDIAN LITTLE_ENDIAN #elif defined(__NetBSD__) || defined(__OpenBSD__) #define __BYTE_ORDER _BYTE_ORDER #define __BIG_ENDIAN _BIG_ENDIAN diff --git a/setup.py b/setup.py index 9a687160..983ac99a 100755..100644 --- a/setup.py +++ b/setup.py @@ -3,6 +3,7 @@ from __future__ import print_function from distutils.core import setup, Extension from distutils.util import get_platform +from distutils.sysconfig import get_python_lib, get_config_vars import io import os import platform @@ -10,6 +11,13 @@ from shutil import copy2 import sys is_win = platform.system() == "Windows" +is_mac = platform.system() == "Darwin" + +def set_extension_compile_args(extension): + rel_lib_path = extension.name.replace('.', '/') + abs_lib_path = os.path.join(get_python_lib(), rel_lib_path) + lib_name = abs_lib_path + '.so' + extension.extra_link_args = [ '-Wl,-install_name,' + lib_name] def buil_all(): packages=[ @@ -132,6 +140,11 @@ def buil_all(): # Force setuptools to use whatever msvc version installed os.environ['MSSdk'] = '1' os.environ['DISTUTILS_USE_SDK'] = '1' + elif is_mac: + for extension in ext_modules_all: + set_extension_compile_args(extension) + cfg_vars = get_config_vars() + cfg_vars['LDSHARED'] = cfg_vars['LDSHARED'].replace('-bundle', '-dynamiclib') print("building") build_ok = False |