From adc91d92a311e55ea5c50d23932e00a2d8c30d94 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sun, 14 Apr 2019 20:32:44 +0200 Subject: [PATCH] Userland: Oops, that merge broke the build, just needed a few tweaks. :^) --- Userland/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Userland/Makefile b/Userland/Makefile index 2a00cf3408..bae2fce710 100644 --- a/Userland/Makefile +++ b/Userland/Makefile @@ -12,7 +12,7 @@ INCLUDE_FLAGS = -I.. -I. -I../LibC DEFINES = -DSERENITY -DSANITIZE_PTRS -DUSERLAND CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(ARCH_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES) -CXX = i686-pca-serenity-g++ +CXX = i686-pc-serenity-g++ LD = i686-pc-serenity-g++ AR = i686-pc-serenity-r LDFLAGS = -L../LibC -L../LibCore -L../LibGUI @@ -30,7 +30,7 @@ clean: $(APPS) : % : %.o $(OBJS) @echo "LD $<" - @$(LD) -o $@ $(LDFLAGS) $< -lc + @$(LD) -o $@ $(LDFLAGS) $< -lc -lgui -lcore %.o: %.cpp @echo "CXX $<"