changes to support for configuring and building R-compatible dynamic …

…libraries
KimTranDong · Jun 5, 2013 · 41ed829 · 41ed829
1 parent 0ce0554
commit 41ed829
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/build b/build
@@ -242,7 +242,7 @@ class Entry:
         self.deps = self.deps.union (list_lib_deps())
 
       self.cmd = fillin (ld, { 
-        'LDFLAGS': fillin (ld_flags, { 'LIBNAME': [ os.path.basename (self.name) ] }) + flags,
+        'LDFLAGS': [ s.replace ('LIBNAME', os.path.basename (self.name)) for s in ld_flags ] + flags,
         'OBJECTS': self.deps,
         'EXECUTABLE': [ self.name ] })
 
@@ -297,7 +297,7 @@ class Entry:
     self.deps = list_lib_deps()
 
     self.cmd = fillin (ld_lib, {
-      'LDLIB_FLAGS': fillin (ld_lib_flags, { 'LIBNAME': [ os.path.basename (self.name) ] }),
+      'LDLIB_FLAGS': [ s.replace ('LIBNAME', os.path.basename (self.name) for s in ld_lib_flags ],
       'OBJECTS': [ item for item in self.deps ],
       'LIB': [ self.name ] })
 

diff --git a/configure b/configure
@@ -391,7 +391,7 @@ elif system == 'windows':
   ld_lib_flags += [ '-shared' ]
 elif system == 'darwin':
   cpp_flags += [ '-DMACOSX', '-fPIC' ]
-  ld_lib_flags += [ '-dynamiclib', '-install_name', '@rpath/LIBNAME' ]
+  ld_lib_flags += [ '-dynamiclib', '-install_name', '@rpath/../'+lib_dir+'/LIBNAME' ]
   lib_suffix = '.dylib'