diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index ac6e41cdb..a5d9bf825 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -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 diff --git a/compiler/Makefile b/compiler/Makefile index 5e6489538..256fc1a95 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -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 \ diff --git a/compiler/lib/Support/CompilerEngine.cpp b/compiler/lib/Support/CompilerEngine.cpp index 02700172a..f35f0d096 100644 --- a/compiler/lib/Support/CompilerEngine.cpp +++ b/compiler/lib/Support/CompilerEngine.cpp @@ -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 ";