update libffi to 3.3 and fix a compilation problem

pharo-project · Dec 12, 2019 · 9bfd9a3 · 9bfd9a3
1 parent 61f357e
commit 9bfd9a3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -73,8 +73,14 @@ ExternalProject_Add(build_libFFI
     UPDATE_COMMAND ""
 
     GIT_REPOSITORY "https://github.com/libffi/libffi.git"
-    GIT_TAG "v3.3-rc0"
-    CONFIGURE_COMMAND "./autogen.sh" COMMAND ./configure "--target=${LIBFFI_TARGET}" "--disable-docs" "--prefix=${CMAKE_CURRENT_BINARY_DIR}/build/libffi/install" "CC=${CMAKE_C_COMPILER}" "CXX=${CMAKE_C_COMPILER}"
+    GIT_TAG "v3.3"
+    CONFIGURE_COMMAND "./autogen.sh" COMMAND ./configure
+		"--target=${LIBFFI_TARGET}"
+		"--disable-docs"
+		"--prefix=${CMAKE_CURRENT_BINARY_DIR}/build/libffi/install"
+		"${LIBFFI_EXTRA_PARAMETERS}"
+		"CC=${CMAKE_C_COMPILER}"
+		"CXX=${CMAKE_C_COMPILER}"
 )
 
 if(OSX)

diff --git a/osx.cmake b/osx.cmake
@@ -8,3 +8,5 @@ set(TEST_LIBRARY_DLL libTestLibrary.dylib)
 
 set(DYLIB_EXT "*.dylib")
 
+# In Esteban's machine this is needed. Maybe for all?
+set(LIBFFI_EXTRA_PARAMETERS "CFLAGS=-I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include")