diff options
| author | Lei YU <mine260309@gmail.com> | 2018-09-19 11:17:09 +0800 |
|---|---|---|
| committer | Lei YU <mine260309@gmail.com> | 2018-09-26 11:15:30 +0800 |
| commit | bd2e80a65ec3e5cc4e27c46ddcb9c0f69aa326e6 (patch) | |
| tree | c1579ac297689aea898862fda75e7577bff84c50 | |
| parent | ecd4bc7bf240b7d30ece98e74f7056b2cab1f38b (diff) | |
| download | phosphor-fan-presence-bd2e80a65ec3e5cc4e27c46ddcb9c0f69aa326e6.tar.gz phosphor-fan-presence-bd2e80a65ec3e5cc4e27c46ddcb9c0f69aa326e6.zip | |
Fix libfan_la_CXXFLAGS
The libfan_la_CXXFLAGS was incorrectly defined as empty by a typo, fix
it.
Then specify gcc-ar gcc-ranlib for link time optimization, otherwise the
static library will get link error.
Tested: Verify the build is OK in CI, local build, and SDK build.
Resolves openbmc/phosphor-fan-presence#11
Change-Id: I17c83b9927a796f8928a71688c1640d1a602a108
Signed-off-by: Lei YU <mine260309@gmail.com>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 87c2fb8..3052713 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libfan.la libfan_la_LDFLAGS = -static libfan_la_LIBADD = \ $(SDBUSPLUS_LIBS) -libfan_la_CXXFLAGS = +libfan_la_CXXFLAGS = \ $(SDBUSPLUS_CFLAGS) -flto libfan_la_SOURCES = \ utility.cpp \ diff --git a/configure.ac b/configure.ac index 94de978..0cb53a8 100644 --- a/configure.ac +++ b/configure.ac @@ -7,6 +7,10 @@ AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([subdir-objects -Wall -Werror foreign dist-xz]) AM_SILENT_RULES([yes]) +# Use gcc-ar and gcc-ranlib for static libraries built with -flto +AC_SUBST([AR], [${ac_tool_prefix}gcc-ar]) +AC_SUBST([RANLIB], [${ac_tool_prefix}gcc-ranlib]) + # Checks for programs. AC_PROG_CXX AM_PROG_AR |
