diff options
author | Andreas Kling <awesomekling@gmail.com> | 2019-02-22 14:43:12 +0100 |
---|---|---|
committer | Andreas Kling <awesomekling@gmail.com> | 2019-02-22 14:45:14 +0100 |
commit | d7753c7c8d07b347014b9bbb1be75c0eac27280c (patch) | |
tree | 360f77a4d48c6d875611db9e3effd9248a931619 /LibGUI | |
parent | b0d1969ca5c4bdffdf5d3a3db9da179aa4e7175c (diff) | |
download | serenity-d7753c7c8d07b347014b9bbb1be75c0eac27280c.zip |
Move over to building all of userspace with i686-pc-serenity-g++.
Diffstat (limited to 'LibGUI')
-rw-r--r-- | LibGUI/Makefile | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/LibGUI/Makefile b/LibGUI/Makefile index 629436e7f3..671c7a396a 100644 --- a/LibGUI/Makefile +++ b/LibGUI/Makefile @@ -35,8 +35,7 @@ OBJS = $(SHAREDGRAPHICS_OBJS) $(LIBGUI_OBJS) LIBS = ../LibC/LibC.a LIBRARY = LibGUI.a -ARCH_FLAGS = -STANDARD_FLAGS = -std=c++17 -nostdinc++ -nostdlib -nostdinc +STANDARD_FLAGS = -std=c++17 WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough FLAVOR_FLAGS = -fno-exceptions -fno-rtti OPTIMIZATION_FLAGS = -Os @@ -44,11 +43,10 @@ INCLUDE_FLAGS = -I../LibC -I.. -I. DEFINES = -DSERENITY -DUSERLAND -DSANITIZE_PTRS -DLIBGUI -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 = +CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES) +CXX = i686-pc-serenity-g++ +LD = i686-pc-serenity-ld +AR = i686-pc-serenity-ar all: $(LIBRARY) |