summaryrefslogtreecommitdiff
path: root/LibGUI
diff options
context:
space:
mode:
authorAndreas Kling <awesomekling@gmail.com>2019-02-22 10:45:32 +0100
committerAndreas Kling <awesomekling@gmail.com>2019-02-22 10:45:32 +0100
commit75b100673fb721eda824372ddee0d7417410c00e (patch)
treeb1ba99e8b18463e2de14a455af4f8c6980486080 /LibGUI
parentafa6f88039b7466151d56650c528dc95009c14aa (diff)
downloadserenity-75b100673fb721eda824372ddee0d7417410c00e.zip
Switch over to building everything with i686-elf-g++.
Diffstat (limited to 'LibGUI')
-rw-r--r--LibGUI/Makefile11
1 files changed, 5 insertions, 6 deletions
diff --git a/LibGUI/Makefile b/LibGUI/Makefile
index ec8abacc1b..629436e7f3 100644
--- a/LibGUI/Makefile
+++ b/LibGUI/Makefile
@@ -37,19 +37,18 @@ LIBS = ../LibC/LibC.a
LIBRARY = LibGUI.a
ARCH_FLAGS =
STANDARD_FLAGS = -std=c++17 -nostdinc++ -nostdlib -nostdinc
-LIBC_FLAGS = -ffreestanding -fno-stack-protector -fno-ident
WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough
-FLAVOR_FLAGS = -march=i686 -m32 -fno-exceptions -fno-rtti
+FLAVOR_FLAGS = -fno-exceptions -fno-rtti
OPTIMIZATION_FLAGS = -Os
INCLUDE_FLAGS = -I../LibC -I.. -I.
DEFINES = -DSERENITY -DUSERLAND -DSANITIZE_PTRS -DLIBGUI
-CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(LIBC_FLAGS) $(FLAVOR_FLAGS) $(ARCH_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES)
-CXX = clang
-LD = ld
+CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(ARCH_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES)
+CXX = i686-elf-g++
+LD = i686-elf-ld
AR = ar
-LDFLAGS = -T linker.ld --strip-debug -melf_i386 --gc-sections
+LDFLAGS =
all: $(LIBRARY)