summaryrefslogtreecommitdiff
path: root/Makefile.common
diff options
context:
space:
mode:
authorjoshua stein <jcs@jcs.org>2020-01-30 21:58:32 -0600
committerAndreas Kling <kling@serenityos.org>2020-02-05 18:39:45 +0100
commitb4568b1422c05ae1b50e6c96d262bb44b8a2f3d8 (patch)
tree364a5223576ca954fcb25a2a99b0660b9e1ffe68 /Makefile.common
parentc33cb8a2896f43a3b2fb0da8df243db55985bb9d (diff)
downloadserenity-b4568b1422c05ae1b50e6c96d262bb44b8a2f3d8.zip
Welcome: Pass -m to ld to fix building with clang/lld
Diffstat (limited to 'Makefile.common')
-rw-r--r--Makefile.common2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.common b/Makefile.common
index 924ae18ffa..33df9ab2d9 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -40,6 +40,7 @@ ifneq ($(USE_HOST_CXX),)
AS = as
LINK = ld
OBJ_SUFFIX ?= .host
+ ARCH = $(shell arch -s)
else
TOOLCHAIN_PATH = $(SERENITY_BASE_DIR)/Toolchain/Local/bin
CXX = $(PRE_CXX) $(TOOLCHAIN_PATH)/i686-pc-serenity-g++
@@ -48,6 +49,7 @@ else
LINK = $(TOOLCHAIN_PATH)/i686-pc-serenity-ld
RANLIB = $(TOOLCHAIN_PATH)/i686-pc-serenity-ranlib
AR = $(TOOLCHAIN_PATH)/i686-pc-serenity-ar
+ ARCH = i386
DEFINES += -DDEBUG