diff options
| author | Oliver O'Halloran <oohall@gmail.com> | 2017-05-08 16:15:45 +1000 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2017-05-10 14:32:27 +1000 |
| commit | e5f672430e0848c596c784dcc9d97c97ea36be79 (patch) | |
| tree | 3246c479c4f334ce4106c3a347578e6b5bf21859 /Makefile.main | |
| parent | 1f7e5ba9bb82e02efb8fe8735f0e10eb14cabf25 (diff) | |
| download | skiboot-e5f672430e0848c596c784dcc9d97c97ea36be79.zip skiboot-e5f672430e0848c596c784dcc9d97c97ea36be79.tar.gz skiboot-e5f672430e0848c596c784dcc9d97c97ea36be79.tar.bz2 | |
pore: Always use libpore
In the days of yore libpore was closed source and people wanted the
option to not use it. That's no longer the case so lets ditch all
the #ifdef crap.
Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'Makefile.main')
| -rw-r--r-- | Makefile.main | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Makefile.main b/Makefile.main index 5494131..65eacb1 100644 --- a/Makefile.main +++ b/Makefile.main @@ -53,9 +53,7 @@ DBG=-g CPPFLAGS := -I$(SRC)/include -Iinclude -MMD -include $(SRC)/include/config.h CPPFLAGS += -I$(SRC)/libfdt -I$(SRC)/libflash -I$(SRC)/libc/include -I$(SRC) -ifeq ($(PORE),1) -CPPFLAGS += -I$(SRC)/libpore -D__HAVE_LIBPORE__ -endif +CPPFLAGS += -I$(SRC)/libpore CPPFLAGS += -D__SKIBOOT__ -nostdinc CPPFLAGS += -isystem $(shell $(CC) -print-file-name=include) CPPFLAGS += -DBITS_PER_LONG=64 -DHAVE_BIG_ENDIAN @@ -193,10 +191,7 @@ all: $(SUBDIRS) $(TARGET).lid $(TARGET).lid.xz $(TARGET).map extract-gcov all: $(TARGET).lid.stb $(TARGET).lid.xz.stb OBJS := $(ASM) $(CORE) $(HW) $(PLATFORMS) $(LIBFDT) $(LIBFLASH) $(LIBSTB) -ifeq ($(PORE),1) -OBJS += $(LIBPORE) -endif -OBJS += $(LIBC) $(CCAN) $(DEVSRC_OBJ) +OBJS += $(LIBC) $(CCAN) $(DEVSRC_OBJ) $(LIBPORE) OBJS_NO_VER = $(OBJS) ALL_OBJS = $(OBJS) version.o |