Fix minor issues

Summary: 1) Building of shared library was broken. 2) Fix to a particular commit of asmjit so that we don't accidentally break anything due to changes in asmjit. Reviewed By: jspark1105, jianyuh Differential Revision: D13165343 fbshipit-source-id: 21ea6cf16c2e7d9b341339fccc0f50b4bf78f903
sszth · Nov 22, 2018 · 670b239 · 670b239
1 parent a1f11f8
commit 670b239
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -148,6 +148,8 @@ if(FBGEMM_LIBRARY_TYPE STREQUAL "default")
 elseif(FBGEMM_LIBRARY_TYPE STREQUAL "shared")
   add_library(fbgemm SHARED $<TARGET_OBJECTS:fbgemm_avx2>
     $<TARGET_OBJECTS:fbgemm_avx512>)
+  set_property(TARGET fbgemm_avx2 PROPERTY POSITION_INDEPENDENT_CODE ON)
+  set_property(TARGET fbgemm_avx512 PROPERTY POSITION_INDEPENDENT_CODE ON)
 elseif(FBGEMM_LIBRARY_TYPE STREQUAL "static")
   add_library(fbgemm STATIC $<TARGET_OBJECTS:fbgemm_avx2>
     $<TARGET_OBJECTS:fbgemm_avx512>)

diff --git a/cmake/modules/DownloadASMJIT.cmake b/cmake/modules/DownloadASMJIT.cmake
@@ -6,7 +6,7 @@ include(ExternalProject)
 
 ExternalProject_Add(asmjit
   GIT_REPOSITORY https://github.com/asmjit/asmjit
-  GIT_TAG master
+  GIT_TAG 673dcefaa048c5f5a2bf8b85daf8f7b9978d018a
   SOURCE_DIR "${FBGEMM_THIRDPARTY_DIR}/asmjit"
   BINARY_DIR "${FBGEMM_BINARY_DIR}/asmjit"
   CONFIGURE_COMMAND ""