tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix building static host executables.

Browse source 
BUILD_HOST_static=1 forces all host binaries to be statically linked.
Since -nodefaultlibs was passed (to disable libstdc++), libgcc wasn't
being passed. This change emulates the driver's behavior.

Also fix default STL selection for BUILD_HOST_static.

Bug: 19567451
Change-Id: I617aab782d40ac76ca5a7d9dddf0f202a4e3a69b
This commit is contained in:
Dan Albert 2015-03-03 14:10:27 -08:00
parent 6492792d8a
commit 8bf4cc97c2
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/cxx_stl_setup.mk
View file

@ -10,6 +10,11 @@ ifeq ($(strip $(LOCAL_CXX_STL)),default)
# Platform code. Select the appropriate STL.
ifndef USE_MINGW
my_cxx_stl := libc++
ifdef LOCAL_IS_HOST_MODULE
ifneq (,$(BUILD_HOST_static))
my_cxx_stl := libc++_static
endif
endif
else
# libc++ is not supported on mingw.
my_cxx_stl := libstdc++
@ -33,7 +38,8 @@ ifneq ($(filter $(my_cxx_stl),libc++ libc++_static),)
ifdef LOCAL_IS_HOST_MODULE
my_cppflags += -nostdinc++
my_ldflags += -nodefaultlibs
my_ldlibs += -lc -lm -lpthread
my_ldlibs += -lpthread -lm
my_ldlibs += -Wl,--start-group -lgcc -lgcc_eh -lc -Wl,--end-group
endif
else ifneq ($(filter $(my_cxx_stl),stlport stlport_static),)
ifndef LOCAL_IS_HOST_MODULE
@ -61,7 +67,8 @@ else ifeq ($(my_cxx_stl),libstdc++)
else ifeq ($(my_cxx_stl),none)
ifdef LOCAL_IS_HOST_MODULE
my_cppflags += -nostdinc++
my_ldflags += -nodefaultlibs -lc -lm
my_ldflags += -nodefaultlibs
my_ldlibs += -lm -Wl,--start-group -lgcc -lgcc_eh -lc -Wl,--end-group
endif
else
$(error $(my_cxx_stl) is not a supported STL.)