From 55ae322d619be42cfd8b4f7a695268c2f8a9629e Mon Sep 17 00:00:00 2001 From: Keith Wiles Date: Fri, 1 May 2015 09:29:47 -0500 Subject: [PATCH] mk: remove NO_AUTOLIBS option NO_AUTOLIBS is not required as it was not used or defined in the config files. Signed-off-by: Keith Wiles Acked-by: Thomas Monjalon --- doc/guides/prog_guide/build_app.rst | 2 -- doc/guides/prog_guide/dev_kit_build_system.rst | 2 -- mk/rte.app.mk | 5 ----- 3 files changed, 9 deletions(-) diff --git a/doc/guides/prog_guide/build_app.rst b/doc/guides/prog_guide/build_app.rst index d4a3261520..138330adc1 100644 --- a/doc/guides/prog_guide/build_app.rst +++ b/doc/guides/prog_guide/build_app.rst @@ -124,5 +124,3 @@ chapter for details. * CPPFLAGS: The flags to use to provide flags to the C preprocessor (only useful when assembling .S files) * LDLIBS: A list of libraries to link with (for example, -L /path/to/libfoo - lfoo) - -* NO_AUTOLIBS: If set, the libraries provided by the framework will not be included in the LDLIBS variable automatically. diff --git a/doc/guides/prog_guide/dev_kit_build_system.rst b/doc/guides/prog_guide/dev_kit_build_system.rst index 5bfef58b5d..04f1d4eb14 100644 --- a/doc/guides/prog_guide/dev_kit_build_system.rst +++ b/doc/guides/prog_guide/dev_kit_build_system.rst @@ -407,8 +407,6 @@ Variables that Can be Set/Overridden by the User in a Makefile or Command Line * LDFLAGS_my_app: Specific flags to add when linking my_app. -* NO_AUTOLIBS: If set, the libraries provided by the framework will not be included in the LDLIBS variable automatically. - * EXTRA_CFLAGS: The content of this variable is appended after CFLAGS when compiling. * EXTRA_LDFLAGS: The content of this variable is appended after LDFLAGS when linking. diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 62a76aede3..af8a1b0c47 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -54,11 +54,8 @@ endif LDLIBS += -L$(RTE_SDK_BIN)/lib # -# Include libraries depending on config if NO_AUTOLIBS is not set # Order is important: from higher level to lower level # -ifeq ($(NO_AUTOLIBS),) - LDLIBS += --whole-archive ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS),y) @@ -265,8 +262,6 @@ LDLIBS += --end-group LDLIBS += --no-whole-archive -endif # ifeq ($(NO_AUTOLIBS),) - LDLIBS += $(CPU_LDLIBS) .PHONY: all -- 2.20.1