From e0e2d7ad04619336c544d9af9c8bf9c815707cb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Vavru=C5=A1a?= <marek.vavrusa@nic.cz>
Date: Tue, 17 Nov 2015 22:41:21 +0100
Subject: [PATCH] build: set ARCH from CC, bump version to beta2
---
Makefile | 2 +-
config.mk | 2 +-
platform.mk | 3 +--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 30697db17..047ba8ed4 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ install: lib-install modules-install daemon-install
check: all tests
clean: lib-clean modules-clean daemon-clean tests-clean doc-clean
doc: doc-html
-.PHONY: all install check clean doc
+.PHONY: all install check clean doc info
# Options
ifdef COVERAGE
diff --git a/config.mk b/config.mk
index 009d9fa8c..a59d86905 100644
--- a/config.mk
+++ b/config.mk
@@ -1,7 +1,7 @@
# Project
MAJOR := 1
MINOR := 0
-PATCH := 0-beta1
+PATCH := 0-beta2
# Paths
PREFIX := /usr/local
diff --git a/platform.mk b/platform.mk
index a8d31bc4c..f8a445035 100644
--- a/platform.mk
+++ b/platform.mk
@@ -10,7 +10,7 @@ MODTYPE := shared
ARTYPE := static
BINEXT :=
PLATFORM = Linux
-ARCH :=
+ARCH := $(word 1, $(subst -, ,$(shell $(CC) -dumpmachine)))
ifeq ($(OS),Windows_NT)
PLATFORM := Windows
RM := del
@@ -18,7 +18,6 @@ ifeq ($(OS),Windows_NT)
LIBEXT := .lib
BINEXT := .exe
else
- ARCH := $(shell uname -m)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
PLATFORM := Darwin
--
GitLab