python: fix merge confliction of #1073

This commit is contained in:
tdube 2018-01-15 00:30:51 -05:00 committed by Nguyen Anh Quynh
parent c7b1f2dc66
commit 85b268c31b
1 changed files with 4 additions and 1 deletions

View File

@ -144,7 +144,10 @@ def build_libraries():
os.system("CAPSTONE_BUILD_CORE_ONLY=yes bash ./make.sh")
shutil.copy(VERSIONED_LIBRARY_FILE, os.path.join(LIBS_DIR, LIBRARY_FILE))
if STATIC_LIBRARY_FILE: shutil.copy(STATIC_LIBRARY_FILE, LIBS_DIR)
# only copy static library if it exists (it's a build option)
if STATIC_LIBRARY_FILE and os.path.exists(STATIC_LIBRARY_FILE):
shutil.copy(STATIC_LIBRARY_FILE, LIBS_DIR)
shutil.copy(LIBRARY_FILE, LIBS_DIR)
os.chdir(cwd)