summaryrefslogtreecommitdiff
path: root/Applications/FontEditor/Makefile
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 /Applications/FontEditor/Makefile
parentafa6f88039b7466151d56650c528dc95009c14aa (diff)
downloadserenity-75b100673fb721eda824372ddee0d7417410c00e.zip
Switch over to building everything with i686-elf-g++.
Diffstat (limited to 'Applications/FontEditor/Makefile')
-rw-r--r--Applications/FontEditor/Makefile9
1 files changed, 4 insertions, 5 deletions
diff --git a/Applications/FontEditor/Makefile b/Applications/FontEditor/Makefile
index e65e962f70..70722ae8cc 100644
--- a/Applications/FontEditor/Makefile
+++ b/Applications/FontEditor/Makefile
@@ -6,7 +6,6 @@ APP = FontEditor
ARCH_FLAGS =
STANDARD_FLAGS = -std=c++17 -nostdinc++ -nostdlib -nostdinc
-USERLAND_FLAGS = -ffreestanding -fno-stack-protector
WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough
FLAVOR_FLAGS = -march=i686 -m32 -fno-exceptions -fno-rtti
OPTIMIZATION_FLAGS = -Os
@@ -14,11 +13,11 @@ INCLUDE_FLAGS = -I../.. -I. -I../../LibC
DEFINES = -DSERENITY -DSANITIZE_PTRS -DUSERLAND
-CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(USERLAND_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 = -static --strip-debug -melf_i386 -e _start --gc-sections
+LDFLAGS = -static
all: $(APP)