From b0f30426cc2efee850d3cbc2f89a6c3ef0ba9097 Mon Sep 17 00:00:00 2001 From: "yangyuhui.807" Date: Thu, 7 Sep 2023 18:40:49 +0800 Subject: [PATCH 1/2] fix pangolin build --- rasp/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rasp/Makefile b/rasp/Makefile index a8fdbc1ac..a58b03fa2 100644 --- a/rasp/Makefile +++ b/rasp/Makefile @@ -126,8 +126,7 @@ pangolin: cmake -B build \ -DCMAKE_BUILD_TYPE=Release \ -DSTATIC_BUILD=$(STATIC) \ - -DCMAKE_TOOLCHAIN_FILE="$(VCPKG_INSTALLATION_ROOT)/scripts/buildsystems/vcpkg.cmake" \ - -DVCPKG_TARGET_TRIPLET=x64-linux-release && \ + && \ $(MAKE) -C build From 9b30cfdbef1c5b50be160ae73693286e2cb68f2f Mon Sep 17 00:00:00 2001 From: "yangyuhui.807" Date: Thu, 7 Sep 2023 18:54:37 +0800 Subject: [PATCH 2/2] feat pangolin make --- rasp/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rasp/Makefile b/rasp/Makefile index a58b03fa2..dde953e72 100644 --- a/rasp/Makefile +++ b/rasp/Makefile @@ -125,8 +125,7 @@ pangolin: mkdir -p build && \ cmake -B build \ -DCMAKE_BUILD_TYPE=Release \ - -DSTATIC_BUILD=$(STATIC) \ - && \ + -DSTATIC_BUILD=$(STATIC) && \ $(MAKE) -C build