From d7497e215bbf31ac055de2221ee786898c287b28 Mon Sep 17 00:00:00 2001 From: alexd Date: Wed, 12 Feb 2025 19:36:26 -0500 Subject: [PATCH] test path --- .github/workflows/build.yml | 4 +--- Makefile | 2 +- setup.py | 4 +++- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8991944b..7de250ed 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -327,9 +327,7 @@ jobs: ######## # Linux - name: Python Wheel Steps (Linux - cibuildwheel) - run: | - export PATH=/usr/bin:$PATH - make dist-py-cibw + run: make dist-py-cibw env: CIBW_BUILD: "${{ matrix.cibuildwheel }}-manylinux*" CIBW_ENVIRONMENT_LINUX: CSP_MANYLINUX="ON" CCACHE_DIR="/host/home/runner/work/csp/csp/.ccache" VCPKG_DEFAULT_BINARY_CACHE="/host${{ env.VCPKG_DEFAULT_BINARY_CACHE }}" VCPKG_DOWNLOADS="/host${{ env.VCPKG_DOWNLOADS }}" diff --git a/Makefile b/Makefile index d7ad836a..e7e1f285 100644 --- a/Makefile +++ b/Makefile @@ -198,7 +198,7 @@ dependencies-debian: ## install dependencies for linux apt-get install -y autoconf autoconf-archive automake bison cmake curl flex libtool ninja-build pkg-config tar unzip zip dependencies-fedora: ## install dependencies for linux - yum install -y pkgconf autoconf autoconf-archive automake bison ccache cmake curl flex libtool openssl-devel perl-IPC-Cmd pkg-config tar unzip zip + yum install -y autoconf autoconf-archive automake bison ccache cmake curl flex libtool perl-IPC-Cmd pkg-config tar unzip zip dependencies-vcpkg: ## install dependencies via vcpkg cd vcpkg && ./bootstrap-vcpkg.sh && ./vcpkg install diff --git a/setup.py b/setup.py index 6d7a1762..18188356 100644 --- a/setup.py +++ b/setup.py @@ -122,7 +122,9 @@ except subprocess.CalledProcessError as e: print("Error obtaining Homebrew prefix for autoconf-archive:", e) aclocal_path = None - +elif platform.system() != "Windows": + os.environ["PATH"] = f"/usr/bin:{os.environ['PATH']}" + if which("ccache") and os.environ.get("CSP_USE_CCACHE", "") != "0": cmake_args.append("-DCSP_USE_CCACHE=On")