Changeset 742 in svn for trunk

Timestamp:

Nov 5, 2012, 4:05:39 PM (12 years ago)

Author:

Pavel Demin

Message:

fix build rules for 64-bit MacOSX

File:

• trunk/genMakefile.tcl (modified) (2 diffs)

trunk/genMakefile.tcl

@@ -269 +269 @@
         @mkdir -p $(@D)
         @echo ">> Building $@"
-ifeq ($(ARCH),aix)
-        @/usr/ibmcxx/bin/makeC++SharedLib $(OutPutOpt) $@ $(LIBS) -p 0 $^
-else
 ifeq ($(ARCH),aix5)
-        @/usr/vacpp/bin/makeC++SharedLib $(OutPutOpt) $@ $(LIBS) -p 0 $^
+        @$(MAKESHARED) $(OutPutOpt) $@ $(LIBS) -p 0 $^
 else
 ifeq ($(PLATFORM),macosx)
 # We need to make both the .dylib and the .so
-        @$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
-        @$(LD) -bundle -undefined $(UNDEFOPT) $(LDFLAGS) $^ $(LIBS) $(OutPutOpt) $(subst .$(DllSuf),.so,$@)
+        @$(LD) $(SOFLAGS)$@ $(LDFLAGS) $^ $(OutPutOpt) $@ $(EXPLLINKLIBS)
+ifneq ($(subst $(MACOSX_MINOR),,1234),1234)
+ifeq ($(MACOSX_MINOR),4)
+        @ln -sf $@ $(subst .$(DllSuf),.so,$@)
+endif
+endif
 else
 ifeq ($(PLATFORM),win32)
@@ -288 +289 @@
         @$(LD) $(SOFLAGS) $(LDFLAGS) $^ $(OutPutOpt) $@ $(EXPLLINKLIBS)
         @$(MT_DLL)
-endif
 endif
 endif