mirrors/unicorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make it easier to link against libunicorn on macOS (#1195)

Browse Source 
Adding @rpath to the install name to make it possible to link against
the library without modifying it with install_name_tool. Copying both
the versioned and unversioned dylibs simplifies linking.
This commit is contained in:
Saagar Jha 2020-02-11 22:16:34 -08:00 committed by GitHub
parent 901efc4bd4
commit d69ebfa55c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -112,7 +112,7 @@ API_MAJOR=$(shell echo `grep -e UC_API_MAJOR include/unicorn/unicorn.h | grep -v
ifeq ($(UNAME_S),Darwin) ifeq ($(UNAME_S),Darwin)
EXT = dylib EXT = dylib
VERSION_EXT = $(API_MAJOR).$(EXT) VERSION_EXT = $(API_MAJOR).$(EXT)
$(LIBNAME)_LDFLAGS += -dynamiclib -install_name lib$(LIBNAME).$(VERSION_EXT) -current_version $(PKG_MAJOR).$(PKG_MINOR).$(PKG_EXTRA) -compatibility_version $(PKG_MAJOR).$(PKG_MINOR) $(LIBNAME)_LDFLAGS += -dynamiclib -install_name @rpath/lib$(LIBNAME).$(VERSION_EXT) -current_version $(PKG_MAJOR).$(PKG_MINOR).$(PKG_EXTRA) -compatibility_version $(PKG_MAJOR).$(PKG_MINOR)
AR_EXT = a AR_EXT = a
UNICORN_CFLAGS += -fvisibility=hidden UNICORN_CFLAGS += -fvisibility=hidden

7
bindings/python/setup.py
View File

@ -60,6 +60,7 @@ else:
if SYSTEM == 'darwin': if SYSTEM == 'darwin':
LIBRARY_FILE = "libunicorn.dylib" LIBRARY_FILE = "libunicorn.dylib"
MAC_LIBRARY_FILE = "libunicorn*.dylib"
STATIC_LIBRARY_FILE = None STATIC_LIBRARY_FILE = None
elif SYSTEM in ('win32', 'cygwin'): elif SYSTEM in ('win32', 'cygwin'):
LIBRARY_FILE = "unicorn.dll" LIBRARY_FILE = "unicorn.dll"
@ -171,7 +172,11 @@ def build_libraries():
subprocess.call(cmd, env=new_env) subprocess.call(cmd, env=new_env)
shutil.copy(LIBRARY_FILE, LIBS_DIR) if SYSTEM == 'darwin':
for file in glob.glob(MAC_LIBRARY_FILE):
shutil.copy(file, LIBS_DIR, follow_symlinks=False)
else:
shutil.copy(LIBRARY_FILE, LIBS_DIR)
try: try:
# static library may fail to build on windows if user doesn't have visual studio installed. this is fine. # static library may fail to build on windows if user doesn't have visual studio installed. this is fine.
if STATIC_LIBRARY_FILE is not None: if STATIC_LIBRARY_FILE is not None: