chore: remove macos workaround for linking runtimelib

This commit is contained in:
youben11
2022-04-04 09:26:42 +01:00
committed by Ayoub Benaissa
parent ec7d1232f1
commit 01f6a334ff
3 changed files with 4 additions and 16 deletions

View File

@@ -229,7 +229,9 @@ jobs:
echo "Debug: ccache statistics (prior to the tests):"
ccache -s
export CONCRETE_PROJECT=${{ github.workspace }}/concrete
make install_runtime_lib
pip3 wheel --no-deps -w ${{ github.workspace }}/wheels .
delocate-wheel -v `find ${{ github.workspace }}/wheels/ -name *macosx*.whl`
pip3 install `find ${{ github.workspace }}/wheels/ -name *macosx*.whl`
make test
echo "Debug: ccache statistics (after the tests):"
ccache -s

View File

@@ -112,16 +112,6 @@ keysetcache_populated: keysetcache.zip
du -sh ${KEYSETCACHEDEV}
rm keysetcache.zip
install: install_runtime_lib
uninstall: uninstall_runtime_lib
install_runtime_lib: concretecompiler
cp $(BUILD_DIR)/lib/libConcretelangRuntime* /usr/local/lib
uninstall_runtime_lib:
-rm /usr/local/lib/libConcretelangRuntime*
# unit-test
clientlib-unit-test: build-clientlib-unit-test
@@ -281,10 +271,6 @@ python_lint:
package_py310 \
release_tarballs \
update_python_version \
install \
uninstall\
install_runtime_lib \
uninstall_runtime_lib \
generate_conv_op \
python_lint \
python_format \

View File

@@ -452,7 +452,7 @@ const std::string CompilerEngine::Library::LINKER = "ld";
#ifdef __APPLE__
// ld in Mac can't find some symbols without specifying these libs
const std::string CompilerEngine::Library::LINKER_SHARED_OPT =
" -dylib -lConcretelangRuntime -lc -o ";
" -dylib -lc -o ";
const std::string CompilerEngine::Library::DOT_SHARED_LIB_EXT = ".dylib";
#else // Linux
const std::string CompilerEngine::Library::LINKER_SHARED_OPT = " --shared -o ";