Welcome: Pass -m to ld to fix building with clang/lld

AmusedNetwork · Feb 5, 2020 · b4568b1 · b4568b1
1 parent c33cb8a
commit b4568b1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Applications/Welcome/Makefile b/Applications/Welcome/Makefile
@@ -9,6 +9,7 @@ LIB_DEPS = GUI Draw IPC Core
 
 .SUFFIXES: .png
 %.png.o: %.png
- @echo "LINK $<"; $(LINK) --relocatable --format binary --output $@ $<
+ @echo "LINK $<"
+ $(QUIET) $(LINK) --relocatable --format binary -m elf_$(ARCH) --output $@ $<
 
 include ../../Makefile.common
diff --git 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