diff options
| author | Damjan Jovanovic <damjan@apache.org> | 2016-12-18 05:10:20 +0000 |
|---|---|---|
| committer | Damjan Jovanovic <damjan@apache.org> | 2016-12-18 05:10:20 +0000 |
| commit | 33cb55d41d1c0f708d2003c91598cf029a14a611 (patch) | |
| tree | c7d7dfdb772e08a6a4b3dc3b118b46c7a9e68d73 | |
| parent | 0a09230b9e7793eb19f7c659249662397ded36fc (diff) | |
#i127139# undefined reference to `__stack_chk_fail' breaks build on some Linux 32-bit systems
Work around this issue for the time being, by always explicitly linking to libc (-lc)
for all gbuild modules, which I've verified doesn't break anything. (Using the Gold linker
instead of BFD also works, also for unknown reasons, but the Gold linker may not always be
available.)
Also revert the previous workaround in main/svl/Library_passwordcontainer.mk
Patch by: me
Notes
Notes:
ignore: obsolete
| -rw-r--r-- | solenv/gbuild/platform/linux.mk | 1 | ||||
| -rw-r--r-- | svl/Library_passwordcontainer.mk | 11 |
2 files changed, 1 insertions, 11 deletions
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk index 9829384b7007..d0a621b30fad 100644 --- a/solenv/gbuild/platform/linux.mk +++ b/solenv/gbuild/platform/linux.mk @@ -241,6 +241,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(patsubst %,-l%,$(EXTERNAL_LIBS)) \ -Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \ $(LIBS) \ + -lc \ -o $(1)) endef diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index 205663618b50..24a81527a7d4 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -41,17 +41,6 @@ $(eval $(call gb_Library_add_api,passwordcontainer,\ offapi \ )) -ifeq ($(GUI),UNX) -ifeq ($(COM),GCC) -ifeq ($(CPUNAME),INTEL) -$(eval $(call gb_Library_set_ldflags,passwordcontainer,\ - $(gb_LinkTarget_LDFLAGS) \ - -Wl$(COMMA)--start-group -lc -Wl$(COMMA)--end-group \ -)) -endif -endif -endif - $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ cppu \ cppuhelper \ |