beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 15:40:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

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

Browse source
This commit is contained in:
joshua stein 2020-01-30 21:58:32 -06:00 committed by Andreas Kling
parent c33cb8a289
commit b4568b1422
Notes: sideshowbarker 2024-07-19 09:36:58 +09:00 
Author: https://github.com/jcs
Commit: https://github.com/SerenityOS/serenity/commit/b4568b1422c
Pull-request: https://github.com/SerenityOS/serenity/pull/1177
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Applications/Welcome/Makefile
View file

@ -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

2
Makefile.common
View file

@ -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