Skip to content

Commit 08ffbae

Browse files
Mike PallBuristan
authored andcommitted
macOS: Remove obsolete -single_module flag.
Thanks to dundargoc. (cherry picked from commit 97813fb) The aforementioned flag is the default since Xcode 2.2 [1]. This patch removes this flag to avoid warnings for modern Xcode versions at the linking stage. [1]: https://bugzilla.mozilla.org/show_bug.cgi?id=1743539#c1 Sergey Kaplun: * added the description for the problem Part of tarantool/tarantool#11691
1 parent 0d0437d commit 08ffbae

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

cmake/SetTargetFlags.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ if(LUAJIT_ARCH STREQUAL "x86")
4747
endif()
4848

4949
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
50-
AppendFlags(TARGET_SHARED_FLAGS -single_module -undefined dynamic_lookup)
50+
AppendFlags(TARGET_SHARED_FLAGS -undefined dynamic_lookup)
5151
else() # Linux and FreeBSD.
5252
AppendFlags(TARGET_BIN_FLAGS -Wl,-E)
5353
list(APPEND TARGET_LIBS dl)

src/Makefile.original

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,13 +329,13 @@ ifeq (Darwin,$(TARGET_SYS))
329329
endif
330330
TARGET_STRIP+= -x
331331
TARGET_XCFLAGS+= -DLUAJIT_UNWIND_EXTERNAL
332-
TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
332+
TARGET_XSHLDFLAGS= -dynamiclib -undefined dynamic_lookup -fPIC
333333
TARGET_DYNXLDOPTS=
334334
TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER)
335335
else
336336
ifeq (iOS,$(TARGET_SYS))
337337
TARGET_STRIP+= -x
338-
TARGET_XSHLDFLAGS= -dynamiclib -single_module -undefined dynamic_lookup -fPIC
338+
TARGET_XSHLDFLAGS= -dynamiclib -undefined dynamic_lookup -fPIC
339339
TARGET_DYNXLDOPTS=
340340
TARGET_XSHLDFLAGS+= -install_name $(TARGET_DYLIBPATH) -compatibility_version $(MAJVER).$(MINVER) -current_version $(MAJVER).$(MINVER).$(RELVER)
341341
ifeq (arm64,$(TARGET_LJARCH))

0 commit comments

Comments
 (0)