cc-tool: pass -latomic in LIBS
Just like -lpthread was passed in LIBS, -latomic should also be passed
in LIBS. In order for this to work, we however need to first fix
cc-tool's Makefile.am so that it does not overwrite LIBS.
This is the first part of fixing the build of cc-tool in a static
linking scenario on SPARC, i.e to fix:
http://autobuild.buildroot.net/results/ed9f2524d0ccef318ff1bc99e5dea980111de989/
The patch has been merged upstream, in
553f9c6016
.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
55a9d6d558
commit
a3b1e975af
50
package/cc-tool/0003-Makefile.am-do-not-overwrite-LIBS.patch
Normal file
50
package/cc-tool/0003-Makefile.am-do-not-overwrite-LIBS.patch
Normal file
|
@ -0,0 +1,50 @@
|
|||
From af3098e05535ddb93bb065770d87738e46089efc Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Sun, 20 Aug 2017 15:06:01 +0200
|
||||
Subject: [PATCH] Makefile.am: do not overwrite LIBS
|
||||
|
||||
LIBS is meant to be passed on the command line with additional
|
||||
libraries, it should not be overwritten by Makefile.am.
|
||||
|
||||
Instead:
|
||||
|
||||
- Use LDADD to link with external libraries
|
||||
|
||||
- Use <target>_LDFLAGS for additional, non-libraries, linker flags
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Upstream: https://github.com/dashesy/cc-tool/commit/553f9c601646af0c6e3f6150d0fa3bc63ff56416
|
||||
---
|
||||
Makefile.am | 8 +++-----
|
||||
1 file changed, 3 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index e79e47b..ed83d91 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -10,14 +10,12 @@ AM_LDFLAGS = \
|
||||
|
||||
# $(BOOST_THREADS_LDFLAGS)
|
||||
|
||||
-LDADD = $(LIBUSB_LIBS)
|
||||
-
|
||||
-LIBS = -s \
|
||||
+LDADD = $(LIBUSB_LIBS) \
|
||||
$(BOOST_FILESYSTEM_LIBS) \
|
||||
$(BOOST_REGEX_LIBS) \
|
||||
$(BOOST_SYSTEM_LIBS) \
|
||||
$(BOOST_PROGRAM_OPTIONS_LIBS)
|
||||
-
|
||||
+
|
||||
# $(BOOST_THREADS_LIBS)
|
||||
|
||||
bin_PROGRAMS=cc-tool
|
||||
@@ -30,4 +28,4 @@ cc_tool_SOURCES=src/main.cpp src/application/cc_flasher.cpp src/application/cc_b
|
||||
src/programmer/cc_253x_254x.cpp src/programmer/cc_251x_111x.cpp \
|
||||
src/programmer/cc_243x.cpp src/programmer/cc_programmer.cpp \
|
||||
src/programmer/cc_unit_driver.cpp src/programmer/cc_unit_info.cpp
|
||||
-
|
||||
+cc_tool_LDFLAGS=-s
|
||||
--
|
||||
2.9.4
|
||||
|
|
@ -16,15 +16,16 @@ CC_TOOL_AUTORECONF = YES
|
|||
|
||||
# Configure script "discovers" boost in /usr/local if not given explicitly
|
||||
CC_TOOL_CONF_OPTS = --with-boost=$(STAGING_DIR)/usr
|
||||
CC_TOOL_CONF_ENV = LIBS="$(CC_TOOL_LIBS)"
|
||||
|
||||
# Help boost.m4 find the Boost Regex library, which needs the pthread
|
||||
# library, but isn't detected using a modern (pkg-config) mechanism.
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
CC_TOOL_CONF_ENV += LIBS="-lpthread"
|
||||
CC_TOOL_LIBS += -lpthread
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
|
||||
CC_TOOL_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -latomic"
|
||||
CC_TOOL_LIBS += -latomic
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
|
Loading…
Reference in a new issue