0ba17462c2e7b3f97e2bcac98b278057886281d5 maximilianh Fri Apr 25 16:26:06 2025 +0200 adding GBIC mode for OSX, no ticket yet, waiting for GBIC for arm on linux update ticket diff --git src/inc/common.mk src/inc/common.mk index 4a3c3b14098..f7057a8f688 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -63,30 +63,35 @@ endif ifeq (${ZLIB},) ifneq ($(wildcard /lib64/libz.a),) ZLIB=/lib64/libz.a else ZLIB=-lz endif endif # for Darwin (Mac OSX), use static libs when they can be found ifeq ($(UNAME_S),Darwin) ifneq ($(wildcard /opt/local/include/openssl/ssl.h),) HG_INC += -I/opt/local/include endif + # on M1, the directory changed + ifneq ($(wildcard /opt/homebrew/include/openssl/ssl.h),) + HG_INC += -I/opt/homebrew/include + L += -L/opt/homebrew/lib/ + endif ifneq ($(wildcard /opt/local/lib/libz.a),) ZLIB = /opt/local/lib/libz.a endif ifneq ($(wildcard /opt/local/lib/libpng.a),) PNGLIB = /opt/local/lib/libpng.a endif ifeq (${BZ2LIB},) ifneq ($(wildcard /opt/local/lib/libbz2.a),) BZ2LIB=/opt/local/lib/libbz2.a endif endif ifneq ($(wildcard /opt/local/lib/libfreetype.a),) FREETYPELIBS = /opt/local/lib/libfreetype.a endif ifneq ($(wildcard /opt/local/lib/libbrotlidec.a),) @@ -530,15 +535,24 @@ JSXHINT=true endif endif ifeq (${JSX},) JSX=${NODEBIN}/jsx ifeq ($(wildcard ${JSX}),) JSX=true endif endif ifeq (${UGLIFYJS},) UGLIFYJS=${NODEBIN}/uglifyjs ifeq ($(wildcard ${UGLIFYJS}),) UGLIFYJS=true endif endif + +# OSX does not have the --remove-destination option. +# We use this option to make sure that the username and date of files lets us figure out +# who was the one that built the current version of a file +ifeq ($(UNAME_S),Darwin) + CPREMDESTOPT=-f +else + CPREMDESTOPT=--remove-destination +endif