Land #237, add support for M1/M1 macOS builds

README.md

@@ -105,6 +105,7 @@ SDK folder.
 * `aarch64-iphone-darwin`
 * `i386-apple-darwin`
 * `x86_64-apple-darwin`
+* `aarch64-apple-darwin`
 
 Available config options are:
 * `:background` - fork to background as a daemon

make/Makefile.common

@@ -26,7 +26,7 @@ ifeq (,$(findstring mingw,$(TARGET)))
 endif
 
 CPPFLAGS:=$(CPPFLAGS) -I$(BUILD)/include -DCURL_STATICLIB
-CONFIG_FIXUP=cp $(DEPS)/config.guess $(DEPS)/config.sub . ;
+CONFIG_FIXUP=cp $(ROOT)/mettle/config.guess $(ROOT)/mettle/config.sub . ;
 CONFIGURE=configure --prefix=$(BUILD) --disable-shared ac_cv_path_PKGCONFIG=$(CWD)/pkg-config
 CONFIGURE_STATIC=configure --prefix=$(BUILD) --static
 ifneq "$(TARGET)" "native"

make/Makefile.json-c

@@ -11,6 +11,7 @@ $(BUILD)/json-c/configure:
 $(BUILD)/json-c/Makefile: $(TOOLS) $(BUILD)/json-c/configure
 	@echo "Configuring json-c for $(TARGET)"
 	@$(SETUP_BUILDENV) cd $(BUILD)/json-c; \
+		$(CONFIG_FIXUP) \
 		$(ENV) ./$(CONFIGURE) $(LOGBUILD)
 
 $(BUILD)/lib/libjson-c.a: $(BUILD)/json-c/Makefile

make/Makefile.libsigar

@@ -3,14 +3,15 @@ $(BUILD)/libsigar/configure:
 	@mkdir -p $(BUILD)
 	@cd $(BUILD); \
 		rm -fr libsigar; \
-		$(TAR) zxf $(ROOT)/deps/libsigar-1.6.3.tar.gz; \
-		mv libsigar-1.6.3 libsigar
+		$(TAR) zxf $(ROOT)/deps/libsigar-1.6.7.tar.gz; \
+		mv libsigar-1.6.7 libsigar
 
 $(BUILD)/libsigar/Makefile: $(TOOLS) $(BUILD)/libsigar/configure
 	@echo "Configuring libsigar for $(TARGET)"
 	@mkdir -p $(BUILD)/libsigar
 	@$(SETUP_BUILDENV) cd $(BUILD)/libsigar; \
 		$(CONFIG_FIXUP) \
+		./autogen.sh; \
 		$(ENV) ./$(CONFIGURE) $(LOGBUILD)
 
 $(BUILD)/lib/libsigar.a: $(BUILD)/libsigar/Makefile

make/Makefile.mettle

@@ -61,7 +61,6 @@ $(BUILD)/mettle/Makefile: $(TOOLS) $(ROOT)/mettle/configure \
 	@echo "Configuring mettle for $(TARGET)"
 	@mkdir -p $(BUILD)/mettle
 	@$(SETUP_BUILDENV) cd $(BUILD)/mettle; \
-		$(CONFIG_FIXUP) \
 		$(ENV) $(ROOT)/mettle/$(CONFIGURE) $(METTLE_OPTS) $(LOGBUILD)
 
 $(BUILD)/bin/mettle.built: $(BUILD)/mettle/Makefile

make/Makefile.tools

@@ -46,6 +46,13 @@ ifneq "$(TARGET)" "native"
         OBJCFLAGS:=$(OBJCFLAGS) $(ADDFLAGS)
         LDFLAGS:=$(LDFLAGS) $(ADDFLAGS)
     endif
+    ifneq (,$(findstring aarch64-apple,$(TARGET)))
+        ADDFLAGS:=-arch arm64
+        CFLAGS:=$(CFLAGS) $(ADDFLAGS)
+        CPPFLAGS:=$(CPPFLAGS) $(ADDFLAGS)
+        OBJCFLAGS:=$(OBJCFLAGS) $(ADDFLAGS)
+        LDFLAGS:=$(LDFLAGS) $(ADDFLAGS)
+    endif
     ifneq (,$(findstring iphone,$(TARGET)))
         ifneq (,$(findstring arm,$(TARGET)))
             ADDFLAGS:=-isysroot $(SDKROOT) -mios-version-min=7.1 -arch armv7