diff options
author | special <special@e03df62e-2008-0410-955e-edbf42e46eb7> | 2007-07-17 09:53:35 +0000 |
---|---|---|
committer | special <special@e03df62e-2008-0410-955e-edbf42e46eb7> | 2007-07-17 09:53:35 +0000 |
commit | 49a4bc63114fcbaf197845cbdebbdd8a90115409 (patch) | |
tree | db29644b8b41640702569bc82006e03f249d6e88 | |
parent | 0b72c64a033a92876acc91344f9580cd276942d1 (diff) |
Module directories now use the concatenated linker flags from every cpp file, instead of just the last (which was rather unpredictable)
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7459 e03df62e-2008-0410-955e-edbf42e46eb7
-rwxr-xr-x | configure | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1356,6 +1356,7 @@ EOCHEESE if ($name =~ /^m_(.+?)$/) { $crapola = ""; $crap3 = ""; + $mliflags = ""; # A module made of multiple files, in a dir, e.g. src/modules/m_spanningtree/ if (opendir(MDIRHANDLE, "src/modules/$name") != 0) { my $i = 0; @@ -1363,7 +1364,7 @@ EOCHEESE foreach $fname (sort readdir(MDIRHANDLE)) { if ($fname =~ /\.cpp$/) { $cmflags = getcompilerflags("src/modules/$name/$fname"); - $liflags = getlinkerflags("src/modules/$name/$fname"); + $mliflags = $mliflags . " " . getlinkerflags("src/modules/$name/$fname"); $deps = getdependencies("src/modules/$name/$fname"); $oname = $fname; $oname =~ s/\.cpp$/.o/g; @@ -1378,7 +1379,7 @@ EOCHEESE if ($config{IS_DARWIN} eq "YES") { print FILEHANDLE "\n \$(CC) -pipe -twolevel_namespace -undefined dynamic_lookup \$(FLAGS) -bundle -o $name.so $crap3\n"; } else { - print FILEHANDLE "\n \$(CC) -pipe \$(FLAGS) -shared $liflags -o $name.so $crap3\n"; + print FILEHANDLE "\n \$(CC) -pipe \$(FLAGS) -shared $mliflags -o $name.so $crap3\n"; } print FILEHANDLE "\n$crapola\n"; closedir(MDIRHANDLE); |