summaryrefslogtreecommitdiff
path: root/source4/build/smb_build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-20 10:55:20 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-20 10:55:20 +0100
commit5f0fab780220045e04adb11843bcb0cd9a9b64d7 (patch)
tree3a9de5b37b26465c54bfaa218151451748ff3830 /source4/build/smb_build
parent1ce345ef97cc7c737aa678b332f39d630688248a (diff)
parentdb2447a7a2b1d39a6849b53f7864e9283daacb6a (diff)
downloadsamba-5f0fab780220045e04adb11843bcb0cd9a9b64d7.tar.gz
samba-5f0fab780220045e04adb11843bcb0cd9a9b64d7.tar.bz2
samba-5f0fab780220045e04adb11843bcb0cd9a9b64d7.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-nodeclare
(This used to be commit 7a2ff3ee26bce49a3eeeb270f4a5e4df2adbefbb)
Diffstat (limited to 'source4/build/smb_build')
-rw-r--r--source4/build/smb_build/makefile.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 22b813b946..17474db00e 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -188,7 +188,7 @@ __EOD__
$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}: \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST) $init_obj
\@echo Linking \$\@
\@mkdir -p $ctx->{SHAREDDIR}
- \@\$(MDLD) \$(MDLD_FLAGS) \$(INTERN_LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
+ \@\$(MDLD) \$(LDFLAGS) \$(MDLD_FLAGS) \$(INTERN_LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
\$($ctx->{NAME}\_FULL_OBJ_LIST) $init_obj \\
\$($ctx->{NAME}_LINK_FLAGS)
__EOD__
@@ -243,7 +243,7 @@ sub SharedLibrary($$)
$ctx->{RESULT_SHARED_LIBRARY}: \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST)
\@echo Linking \$\@
\@mkdir -p $ctx->{SHAREDDIR}
- \@\$(SHLD) \$(SHLD_FLAGS) \$(INTERN_LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
+ \@\$(SHLD) \$(LDFLAGS) \$(SHLD_FLAGS) \$(INTERN_LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
\$($ctx->{NAME}\_FULL_OBJ_LIST) \\
\$($ctx->{NAME}_LINK_FLAGS) \\
$soarg$lns