From 84120664cab98a4639e225cc10e60d6362ae9091 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 3 Aug 2022 23:23:45 +0200
Subject: [PATCH] Make Circe CI script more consistent with Cirrus CI

Use the same environment variables in the same way.

No real changes.
---
 .circleci/config.yml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b95301f589..e925f60fc1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,6 +15,15 @@ jobs:
       - run:
           name: Install dependencies
           command: |
+            echo LD_LIBRARY_PATH=`pwd`/lib >> $BASH_ENV
+
+            # Do _not_ use the CPU count returned by build/tools/proc_count.sh
+            # for building, it is too high (36 logical CPUs) and results in
+            # running out of memory, so limit ourselves to just 2 CPUs we're
+            # supposed to be using in Docker Medium resource class.
+            wxPROC_COUNT=2
+            echo wxBUILD_ARGS=-j$wxPROC_COUNT >> $BASH_ENV
+
             WX_EXTRA_PACKAGES=ccache ./build/tools/before_install.sh
 
             echo "PATH=/usr/lib64/ccache:$PATH" >> $BASH_ENV
@@ -34,13 +43,10 @@ jobs:
           name: Configure
           command: ./configure --disable-debug-info
 
-      # Do _not_ use total CPU count for building, it is too high (36 logical
-      # CPUs) and results in running out of memory, so limit ourselves to just
-      # 2 CPUs we're supposed to be using in Docker Medium resource class.
       - run:
           name: Build
           command: |
-            make -k -j2 CXXFLAGS='-Werror -Wno-error=cpp'
+            make -k $wxBUILD_ARGS CXXFLAGS='-Werror -Wno-error=cpp'
 
       - run:
           name: Show ccache statistics