--- src/Makevars.orig	2023-02-01 05:02:18.000000000 +0700
+++ src/Makevars	2023-03-19 00:35:11.000000000 +0700
@@ -4,7 +4,7 @@
 
 OSQP_FLAGS=-DR_LANG=TRUE
 
-PKG_CXXFLAGS=-I$(OSQP_INCLUDE_TARGET_DIR)
+PKG_CXXFLAGS=-I$(OSQP_INCLUDE_TARGET_DIR) @ARCHFLAGS@
 PKG_LIBS=-L$(OSQP_LIB_TARGET_DIR) -losqp
 
 FIXES_SCRIPT=../inst/26ce409b_fixes/make_fixes.R
@@ -12,6 +12,9 @@
 ROBJECTS=osqp_solve_interface.o RcppExports.o
 OBJECTS=$(ROBJECTS)
 
+CC=@CC@
+CXX=@CXX@
+
 CXX_STD=CXX17
 
 .PHONY: $(R_OBJECTS) all

--- src/osqp_sources/CMakeLists.txt.orig	2023-02-01 04:24:09.000000000 +0700
+++ src/osqp_sources/CMakeLists.txt	2023-03-19 01:14:32.000000000 +0700
@@ -29,7 +29,7 @@
     set(IS_WINDOWS ON)
 endif()
 
-
+set(CMAKE_OSX_ARCHITECTURES "@ARCH@")
 
 # Set options
 # ----------------------------------------------