diff --git a/Makefile b/Makefile index 43e978fed3eeae5b852a560d7b6b318bdc24ee2b..0038f0f0a1d43116dbadbf709b3520b5ad64b762 100644 --- a/Makefile +++ b/Makefile @@ -4,11 +4,12 @@ default: ; install-cargo: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs |\ - sh -s -- -y --profile default --default-toolchain 1.64.0 + sh -s -- -y --profile default --default-toolchain 1.65.0 centos7-cmake3: [ -f /usr/bin/cmake ] && sudo rm /usr/bin/cmake sudo ln -s /usr/bin/cmake3 /usr/bin/cmake + sudo sed -i 's/*link_gomp: /*link_gomp: --fPIE/g' $$(find /opt -name libgomp.spec) reset-submodules: git submodule foreach --recursive 'git clean -dxf && git reset --hard' @@ -28,7 +29,7 @@ build-release: tarantool-patch install: mkdir -p $(DESTDIR)/usr/bin - install -m 0755 target/debug/picodata $(DESTDIR)/usr/bin/picodata + install -m 0755 target/*/picodata $(DESTDIR)/usr/bin/picodata fmt: cargo fmt diff --git a/rpm/picodata.spec b/rpm/picodata.spec index 31a58f128ebb1bb9811ac2473f62bd6a7be4e208..6d3e88b4d45e8cca5c1ee9ad2bb38604beef8e65 100644 --- a/rpm/picodata.spec +++ b/rpm/picodata.spec @@ -38,7 +38,7 @@ make install-cargo %if %use_cmake3 make centos7-cmake3 %endif -make build +make build-release %install %make_install