From c34f6bb67a569ee1f5e7c325fdd5254c489d796e Mon Sep 17 00:00:00 2001
From: Harsh Vardhan <openroad@chez-vardhan.com>
Date: Tue, 28 Mar 2023 18:29:08 -0700
Subject: [PATCH] fix: merge conflict

Signed-off-by: Harsh Vardhan <openroad@chez-vardhan.com>
---
 CMakeLists.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5646bf3..b5643519 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -505,14 +505,13 @@ target_include_directories(OpenSTA
   ${CUDD_INCLUDE}
   )
 
-# common to gcc/clang
 set(CXX_COMMON_FLAGS -Wall -Wextra -pedantic -Wcast-qual -Wredundant-decls -Wformat-security -Wp,-D_GLIBCXX_ASSERTIONS)
 
 target_compile_options(OpenSTA
   PRIVATE
   $<$<CXX_COMPILER_ID:GNU>:${CXX_COMMON_FLAGS}>
-  $<$<CXX_COMPILER_ID:Clang>:${CXX_COMMON_FLAGS} -Wno-gnu-zero-variadic-macro-arguments>
   $<$<CXX_COMPILER_ID:AppleClang>:${CXX_COMMON_FLAGS} -Wno-gnu-zero-variadic-macro-arguments>
+  $<$<CXX_COMPILER_ID:Clang>:${CXX_COMMON_FLAGS} -Wno-gnu-zero-variadic-macro-arguments>
   )
 
 # Disable compiler specific extensions like gnu++11.