summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-02-28 10:52:06 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:49:00 -0500
commit82266dc22f80a435b2e7c46f6afb5dc59d871bf9 (patch)
tree45eaabd03b2b4edcdabff1a797eb8fd3b68fd2fc
parent179a9c72107609e3e5a06a7bf8f34c4ed9a341e8 (diff)
downloadsamba-82266dc22f80a435b2e7c46f6afb5dc59d871bf9.tar.gz
samba-82266dc22f80a435b2e7c46f6afb5dc59d871bf9.tar.bz2
samba-82266dc22f80a435b2e7c46f6afb5dc59d871bf9.zip
r21582: Allow modification of LDFLAGS
(This used to be commit 1726bd33782d1ee77a292bdc0c840959c1c3fb50)
-rw-r--r--source4/build/m4/check_ld.m415
1 files changed, 7 insertions, 8 deletions
diff --git a/source4/build/m4/check_ld.m4 b/source4/build/m4/check_ld.m4
index bc0c0a07f1..f7202b63eb 100644
--- a/source4/build/m4/check_ld.m4
+++ b/source4/build/m4/check_ld.m4
@@ -30,7 +30,6 @@ STLD=${PROG_AR}
STLD_FLAGS="-rcs"
BLDSHARED="false"
LD="${CC}"
-LDFLAGS=""
SHLD="${CC}"
SHLD_FLAGS="-shared"
SHLIBEXT="so"
@@ -45,7 +44,7 @@ case "$host_os" in
BLDSHARED="true"
SHLD_FLAGS="-shared -Wl,-Bsymbolic"
SHLD_UNDEF_FLAGS="-Wl,--allow-shlib-undefined"
- LDFLAGS="-Wl,--export-dynamic"
+ LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
PICFLAG="-fPIC"
SONAMEFLAG="-Wl,-soname="
;;
@@ -57,7 +56,7 @@ case "$host_os" in
PICFLAG="-fPIC"
SONAMEFLAG="-Wl,-soname="
if test "${ac_cv_prog_gnu_ld}" = "yes"; then
- LDFLAGS="-Wl,-E"
+ LDFLAGS="$LDFLAGS -Wl,-E"
fi
else
PICFLAG="-KPIC"
@@ -74,13 +73,13 @@ case "$host_os" in
;;
*netbsd* | *freebsd* | *dragonfly* )
BLDSHARED="true"
- LDFLAGS="-Wl,--export-dynamic"
+ LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
SONAMEFLAG="-Wl,-soname,"
PICFLAG="-fPIC -DPIC"
;;
*openbsd*)
BLDSHARED="true"
- LDFLAGS="-Wl,-Bdynamic"
+ LDFLAGS="$LDFLAGS -Wl,-Bdynamic"
SONAMEFLAG="-Wl,-soname,"
PICFLAG="-fPIC"
;;
@@ -98,7 +97,7 @@ case "$host_os" in
*aix*)
BLDSHARED="true"
SHLD_FLAGS="-Wl,-G,-bexpall,-bbigtoc"
- LDFLAGS="-Wl,-brtl,-bexpall,-bbigtoc"
+ LDFLAGS="$LDFLAGS -Wl,-brtl,-bexpall,-bbigtoc"
# as AIX code is always position independent...
PICFLAG="-O2"
;;
@@ -115,10 +114,10 @@ case "$host_os" in
fi
if test "$host_cpu" = "ia64"; then
SHLIBEXT="so"
- LDFLAGS="-Wl,-E,+b/usr/local/lib/hpux32:/usr/lib/hpux32"
+ LDFLAGS="$LDFLAGS -Wl,-E,+b/usr/local/lib/hpux32:/usr/lib/hpux32"
else
SHLIBEXT="sl"
- LDFLAGS="-Wl,-E,+b/usr/local/lib:/usr/lib"
+ LDFLAGS="$LDFLAGS -Wl,-E,+b/usr/local/lib:/usr/lib"
fi
;;
*osf*)