Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions mesonbuild/cmake/interpreter.py
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,9 @@ def process_object_libs(self, obj_target_list: T.List['ConverterTarget'], linker
# Filter out object files from the sources
self.generated = [x for x in self.generated if not any(x.name.endswith('.' + y) for y in obj_suffixes)]

if not self.sources and not self.generated and self.object_libs:
self.pie |= all(x.pie for x in self.object_libs)

def _append_objlib_sources(self, tgt: 'ConverterTarget') -> None:
self.includes += tgt.includes
self.sources += tgt.sources
Expand Down
7 changes: 7 additions & 0 deletions test cases/cmake/29 object library pic/meson.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
project('29 object library pic', 'c')

cm = import('cmake')
sub_pro = cm.subproject('cmTest')
sub_dep = sub_pro.dependency('cmTestLib')

shared_library('slib', 'slib.c', dependencies: sub_dep)
3 changes: 3 additions & 0 deletions test cases/cmake/29 object library pic/slib.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
extern void f(void);

void g(void) { f(); }
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
cmake_minimum_required(VERSION ${CMAKE_VERSION})

project(cmTest C)

add_library(cmTestLib_objs OBJECT "x.c")
set_target_properties(cmTestLib_objs PROPERTIES POSITION_INDEPENDENT_CODE TRUE)

add_library(cmTestLib STATIC $<TARGET_OBJECTS:cmTestLib_objs>)
set_target_properties(cmTestLib PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
void f(void) { }
Loading