mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-10 22:00:09 +02:00
deadea403d
fixed secondary arch added debug package install pkg-config file install & build versioned version of the library
26 lines
943 B
Plaintext
26 lines
943 B
Plaintext
From ec1e84e8ecefb81f7a233f047c75446eee9dfb54 Mon Sep 17 00:00:00 2001
|
|
From: Leorize <alaviss@users.noreply.github.com>
|
|
Date: Sat, 16 Dec 2017 15:06:42 +0700
|
|
Subject: Makefile: fix architecture detection
|
|
|
|
|
|
diff --git a/GNUmakefile b/GNUmakefile
|
|
index 2a0ff4c..ddd5422 100644
|
|
--- a/GNUmakefile
|
|
+++ b/GNUmakefile
|
|
@@ -15,9 +15,9 @@ LN ?= ln -sf
|
|
LDCONF ?= /sbin/ldconfig -n
|
|
UNAME := $(shell uname)
|
|
|
|
-IS_X86 := $(shell uname -m | $(EGREP) -v "x86_64" | $(EGREP) -i -c "i.86|x86|i86")
|
|
+IS_X86 := $(shell $(CXX) $(CXXFLAGS) -dumpmachine 2>/dev/null | $(EGREP) -v "64" | $(EGREP) -i -c "i.86|x86|i86")
|
|
IS_X32 ?= 0
|
|
-IS_X64 := $(shell uname -m | $(EGREP) -i -c "(_64|d64)")
|
|
+IS_X64 := $(shell $(CXX) $(CXXFLAGS) -dumpmachine 2>/dev/null | $(EGREP) -i -c "(_64|d64)")
|
|
IS_PPC := $(shell uname -m | $(EGREP) -i -c "ppc|power")
|
|
IS_ARM32 := $(shell uname -m | $(EGREP) -i -c "arm")
|
|
IS_ARM64 := $(shell uname -m | $(EGREP) -i -c "aarch64")
|
|
--
|
|
2.15.0
|
|
|