Skip to content

Commit

Permalink
Merge pull request #1191 from VictorMiasnikov/d5.11.9-ZZYYXX-20241119…
Browse files Browse the repository at this point in the history
…_20-37

Fix "ld" warnings on Mac Os ( OS "Darwin")
  • Loading branch information
demoitem authored Nov 19, 2024
2 parents c19fd49 + 5dbd1e7 commit 18e32cf
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions m3-sys/cminstall/src/config/Darwin.common
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ OPENGL_FRAMEWORK = "/System/Library/Frameworks/OpenGL.framework"
LIBGL_DYLIB = OPENGL_FRAMEWORK & "/Versions/A/Libraries/libGL.dylib"

SYSTEM_LIBS = {
"LIBC" : [ "-lSystem" ],
% "LIBC" : [ "-lSystem" ],
"LEX-YACC" : [ "-ll" ],
"FLEX-BISON" : [ "-lfl" ],
"TCP" : [ ]
Expand Down Expand Up @@ -255,7 +255,7 @@ proc make_lib (lib, options, objects, imported_libs, shared) is
% build the shared library
ret_code = try_exec (
"@" & SYSTEM_CC_LD, "-dynamiclib",
"-multiply_defined error",
%"-multiply_defined error",
"-twolevel_namespace",
"-compatibility_version", vmaj,
"-current_version", version,
Expand Down Expand Up @@ -336,8 +336,8 @@ proc m3_link (prog, options, objects, imported_libs, shared) is
objects,
imported_libs,
% "-allow_stack_execute",
"-multiply_defined suppress", % unfortunately needed for __cxa_atexit?
"-bind_at_load",
% "-multiply_defined suppress", % unfortunately needed for __cxa_atexit?
% "-bind_at_load",
"-shared-libgcc",
% "-pie", % requires 10.5
"-dead_strip",
Expand Down

0 comments on commit 18e32cf

Please sign in to comment.