The linker on MacOS 10.4 does not understand -Wl,-z,defs.

[osl.git] / Makefile

diff --git a/Makefile b/Makefile
index 6350b8eccba228c2185f267c5b1158df6b6bc9ea..3bcbfbe7a59645fe197e1414a3d1608463741c6e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,12 +11,13 @@ libname := osl
 ifeq ($(uname_s),Linux)
        dso_opts := --shared -Wl,-soname,libosl.so.$(major_version)
        dso_filename :=lib$(libname).so.$(major_version).$(minor_version).$(patchlevel_version)
+       # disallow undefined symbols
+       LDFLAGS += -Wl,-z,defs
 endif
 ifeq ($(uname_s),Darwin)
-       mac_major_version := $(shell expr 41 + $(major_version))
        dso_opts := -dynamiclib -current_version $(major_version).$(minor_version) \
                -compatibility_version $(major_version).$(minor_version) -fvisibility=hidden
-       dso_filename := lib$(libname).$(shell printf "\\x"$(mac_major_version).dylib)
+       dso_filename := lib$(libname).$(major_version)
 endif
 ifeq ($(uname_s),SunOS)
        dso_opts := --shared -z text -z defs
@@ -33,9 +34,6 @@ ifeq ($(uname_s),NetBSD)
 endif
 all: $(dso_filename)
 
-# disallow undefined symbols
-LDFLAGS += -Wl,-z,defs
-
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls
 CPPFLAGS += -Os