You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bn...@apache.org on 2023/10/26 16:21:52 UTC

[trafficserver-ci] branch main updated: try to fix cmake osx m1 build

This is an automated email from the ASF dual-hosted git repository.

bnolsen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git


The following commit(s) were added to refs/heads/main by this push:
     new dfd9393  try to fix cmake osx m1 build
     new 60f3d9f  Merge pull request #266 from traeak/cmake_m1
dfd9393 is described below

commit dfd9393688fddb77545401b5d26440fc0a8fe6ef
Author: Brian Olsen <bn...@gmail.com>
AuthorDate: Thu Oct 26 10:19:57 2023 -0600

    try to fix cmake osx m1 build
---
 jenkins/branch/osx-m1.pipeline | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/jenkins/branch/osx-m1.pipeline b/jenkins/branch/osx-m1.pipeline
index af700f0..c2befc2 100644
--- a/jenkins/branch/osx-m1.pipeline
+++ b/jenkins/branch/osx-m1.pipeline
@@ -30,22 +30,27 @@ pipeline {
 
 						if [ -d cmake ]
 						then
-							CC="clang" \
-              	CXX="clang++" \
-              	CXXFLAGS="-Qunused-arguments" \
-              	WITH_LIBCPLUSPLUS="yes" \
-              	cmake -B build \
-									--preset ci \
-									-G "Unix Makefiles" \
-									-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl
+							export CC="clang"
+              export CXX="clang++"
+              export CXXFLAGS="-Qunused-arguments"
+              export WITH_LIBCPLUSPLUS="yes"
+              cmake -B build \
+								-G "Unix Makefiles" \
+        				-DCMAKE_BUILD_TYPE=Debug \
+        				-DCMAKE_INSTALL_PREFIX=/tmp/ats" \
+        				-DENABLE_CCACHE=ON" \
+        				-DBUILD_EXPERIMENTAL_PLUGINS=ON" \
+        				-DBUILD_REGRESSION_TESTING=ON" \
+        				-DENABLE_EXAMPLE=ON \
+								-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl
               cmake --build build -j3 -v
 						else
 							autoreconf -fiv
-							CC="clang" \
-								CXX="clang++" \
-								CXXFLAGS="-Qunused-arguments" \
-								WITH_LIBCPLUSPLUS="yes" \
-								./configure \
+							export CC="clang"
+							export CXX="clang++"
+							export CXXFLAGS="-Qunused-arguments"
+							export WITH_LIBCPLUSPLUS="yes"
+							./configure \
 								--enable-experimental-plugins \
 								--with-openssl=/usr/local/opt/openssl
 							make -j3