From: Erlend E. Aasland Date: Thu, 23 Feb 2023 15:02:23 +0000 (+0100) Subject: gh-101981: Consolidate macOS configure steps in CI (GH-102131) X-Git-Tag: v3.12.0a6~90 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e07b304bb004e1298283c82bd135dd5ef96a90cc;p=thirdparty%2FPython%2Fcpython.git gh-101981: Consolidate macOS configure steps in CI (GH-102131) Automerge-Triggered-By: GH:erlend-aasland --- diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eec11e25a7c7..2241b0b8aa40 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -162,13 +162,11 @@ jobs: - uses: actions/checkout@v3 - name: Install Homebrew dependencies run: brew install pkg-config openssl@1.1 xz gdbm tcl-tk - - name: Prepare Homebrew environment variables - run: | - echo "CFLAGS=-I$(brew --prefix gdbm)/include -I$(brew --prefix xz)/include" >> $GITHUB_ENV - echo "LDFLAGS=-L$(brew --prefix gdbm)/lib -I$(brew --prefix xz)/lib" >> $GITHUB_ENV - echo "PKG_CONFIG_PATH=$(brew --prefix openssl@1.1)/lib/pkgconfig:$(brew --prefix tcl-tk)/lib/pkgconfig" >> $GITHUB_ENV - name: Configure CPython run: | + CFLAGS="-I$(brew --prefix gdbm)/include -I$(brew --prefix xz)/include" \ + LDFLAGS="-L$(brew --prefix gdbm)/lib -I$(brew --prefix xz)/lib" \ + PKG_CONFIG_PATH="$(brew --prefix tcl-tk)/lib/pkgconfig" \ ./configure \ --with-pydebug \ --prefix=/opt/python-dev \