add $(UNIVERSAL_ARCHFLAGS) to build

Author: MihirLuthra

src/cregistry/Makefile.in

@@ -14,7 +14,7 @@ include ../../Mk/macports.autoconf.mk
 # required for strdup(3) on Linux and macOS
 CPPFLAGS+=-D_XOPEN_SOURCE=600
 
-CFLAGS+= ${SQLITE3_CFLAGS}
+CFLAGS+= ${UNIVERSAL_ARCHFLAGS} ${SQLITE3_CFLAGS}
 LIBS+= ${SQLITE3_LIBS}
 
 all:: ${STLIB_NAME} ${SQLEXT_NAME}

src/darwintrace_share/Makefile.in

@@ -3,7 +3,7 @@ VPATH  = @srcdir@
 
 include $(srcdir)/../../Mk/macports.autoconf.mk
 
-CFLAGS += -fPIC
+CFLAGS += -fPIC $(UNIVERSAL_ARCHFLAGS)
 
 SRCS = \
 	$(srcdir)/shm_alloc/shm_alloc.c \

src/pextlib1.0/Makefile.in

@@ -46,6 +46,8 @@ endif
 CPPFLAGS+= -I$(srcdir)/../compat
 LIBS+= $(COMPAT_OBJS)
 
+CFLAGS += ${UNIVERSAL_ARCHFLAGS}
+
 SHLIB_NAME= Pextlib${SHLIB_SUFFIX}
 INSTALLDIR= ${TCL_PACKAGE_PATH}/pextlib1.0
 
@@ -62,7 +64,7 @@ $(SHLIB_NAME): $(DARWINTRACE_SHARE_LIB)
 
 ifeq (darwin,@OS_PLATFORM@)
 LIBS+= ../registry2.0/registry${SHLIB_SUFFIX}
-SHLIB_LDFLAGS+= -install_name ${INSTALLDIR}/${SHLIB_NAME}
+SHLIB_LDFLAGS+= -install_name ${INSTALLDIR}/${SHLIB_NAME} ${UNIVERSAL_ARCHFLAGS}
 ${SHLIB_NAME}: ../registry2.0/registry${SHLIB_SUFFIX}
 endif
 

src/registry2.0/Makefile.in

@@ -20,10 +20,10 @@ CPPFLAGS+=-D_XOPEN_SOURCE=600
 
 pkgIndex.tcl: $(SRCS) $(SRCS_AUTOCONF)
 
-CFLAGS+=	${SQLITE3_CFLAGS}
+CFLAGS+= ${SQLITE3_CFLAGS} ${UNIVERSAL_ARCHFLAGS}
 LIBS+=	${SQLITE3_LIBS} ../cregistry/cregistry.a
 ifeq (darwin,@OS_PLATFORM@)
-SHLIB_LDFLAGS+= -install_name @loader_path/../registry2.0/${SHLIB_NAME}
+SHLIB_LDFLAGS+= ${UNIVERSAL_ARCHFLAGS} -install_name @loader_path/../registry2.0/${SHLIB_NAME}
 endif
 
 ${SHLIB_NAME}: ../cregistry/cregistry.a