Simpler specification of CFLAGS and LDFLAGS

By being more consistant in applying CFLAGS and LDFLAGS (in
particular) to every invocation, we make it simpler to enable gcov
code coverage, both in the build system and on the build farm.

Andrew Bartlett
(This used to be commit 8c2f658a9688f0c51d2f3b948dc3213b65c7b77f)

diff --git a/source4/Makefile b/source4/Makefile
index ea98b5e469f522400a1a9fbb7e2da45629ed94b6..1fddfefce3b3fcb444165d5c1f3734a022a445ad 100644 (file)
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -14,10 +14,10 @@ SETUPDIR = $(datadir)/setup
 NCALRPCDIR = $(localstatedir)/ncalrpc
 
 BNLD = $(LD)
 NCALRPCDIR = $(localstatedir)/ncalrpc
 
 BNLD = $(LD)

-BNLD_FLAGS = $(LDFLAGS)
+BNLD_FLAGS = $(LDFLAGS) $(SYS_LDFLAGS)

 
 HOSTCC_FLAGS = -D_SAMBA_HOSTCC_ $(CFLAGS)
 
 HOSTCC_FLAGS = -D_SAMBA_HOSTCC_ $(CFLAGS)

-HOSTLD_FLAGS = $(LDFLAGS)
+HOSTLD_FLAGS = $(LDFLAGS) $(SYS_LDFLAGS)

 
 default: all
 
 
 default: all
 

diff --git a/source4/build/m4/check_ld.m4 b/source4/build/m4/check_ld.m4
index 3b69057a69dd2d8d167afdd8a92bb830e0292095..0d0742e5d22a8bc99178c30b970e5905a5ea2b93 100644 (file)
--- a/source4/build/m4/check_ld.m4
+++ b/source4/build/m4/check_ld.m4
@@ -13,6 +13,7 @@ LD=""
 
 AC_SUBST(BLDSHARED)
 AC_SUBST(LD)
 
 AC_SUBST(BLDSHARED)
 AC_SUBST(LD)

+AC_SUBST(SYS_LDFLAGS)

 AC_SUBST(LDFLAGS)
 
 # Assume non-shared by default and override below
 AC_SUBST(LDFLAGS)
 
 # Assume non-shared by default and override below


@@ -32,13 +33,13 @@ AC_MSG_CHECKING([whether to try to build shared libraries on $host_os])
 case "$host_os" in
        *linux*)
                BLDSHARED="true"
 case "$host_os" in
        *linux*)
                BLDSHARED="true"

-               LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+               SYS_LDFLAGS="-Wl,--export-dynamic"

                ;;
        *solaris*)
                BLDSHARED="true"
                if test "${GCC}" = "yes"; then
                        if test "${ac_cv_prog_gnu_ld}" = "yes"; then
                ;;
        *solaris*)
                BLDSHARED="true"
                if test "${GCC}" = "yes"; then
                        if test "${ac_cv_prog_gnu_ld}" = "yes"; then

-                               LDFLAGS="$LDFLAGS -Wl,-E"
+                               SYS_LDFLAGS="-Wl,-E"

                        fi
                fi
                ;;
                        fi
                fi
                ;;


@@ -47,26 +48,26 @@ case "$host_os" in
                ;;
        *netbsd* | *freebsd* | *dragonfly* )  
                BLDSHARED="true"
                ;;
        *netbsd* | *freebsd* | *dragonfly* )  
                BLDSHARED="true"

-               LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+               SYS_LDFLAGS="-Wl,--export-dynamic"

                ;;
        *openbsd*)
                BLDSHARED="true"
                ;;
        *openbsd*)
                BLDSHARED="true"

-               LDFLAGS="$LDFLAGS -Wl,-Bdynamic"
+               SYS_LDFLAGS="-Wl,-Bdynamic"

                ;;
        *irix*)
                BLDSHARED="true"
                ;;
        *aix*)
                BLDSHARED="true"
                ;;
        *irix*)
                BLDSHARED="true"
                ;;
        *aix*)
                BLDSHARED="true"

-               LDFLAGS="$LDFLAGS -Wl,-brtl,-bexpall,-bbigtoc"
+               SYS_LDFLAGS="-Wl,-brtl,-bexpall,-bbigtoc"

                ;;
        *hpux*)
                # Use special PIC flags for the native HP-UX compiler.
                BLDSHARED="true" # I hope this is correct
                if test "$host_cpu" = "ia64"; then
                ;;
        *hpux*)
                # Use special PIC flags for the native HP-UX compiler.
                BLDSHARED="true" # I hope this is correct
                if test "$host_cpu" = "ia64"; then

-                       LDFLAGS="$LDFLAGS -Wl,-E,+b/usr/local/lib/hpux32:/usr/lib/hpux32"
+                       SYS_LDFLAGS="-Wl,-E,+b/usr/local/lib/hpux32:/usr/lib/hpux32"

                else
                else

-                       LDFLAGS="$LDFLAGS -Wl,-E,+b/usr/local/lib:/usr/lib"
+                       SYS_LDFLAGS="-Wl,-E,+b/usr/local/lib:/usr/lib"

                fi
                ;;
        *osf*)
                fi
                ;;
        *osf*)


@@ -86,6 +87,8 @@ AC_MSG_CHECKING([LD])
 AC_MSG_RESULT([$LD])
 AC_MSG_CHECKING([LDFLAGS])
 AC_MSG_RESULT([$LDFLAGS])
 AC_MSG_RESULT([$LD])
 AC_MSG_CHECKING([LDFLAGS])
 AC_MSG_RESULT([$LDFLAGS])

+AC_MSG_CHECKING([SYS_LDFLAGS])
+AC_MSG_RESULT([$SYS_LDFLAGS])

 
 AC_SUBST(HOSTLD)
 
 
 AC_SUBST(HOSTLD)
 

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index d11e761ce14f6094423c3e62677b72796674d545..498b61900145bca97abcb26357681bb562a0bf68 100644 (file)
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -187,7 +187,7 @@ __EOD__
 $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}: \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST) $init_obj
        \@echo Linking \$\@
        \@mkdir -p $ctx->{SHAREDDIR}
 $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__
                \$($ctx->{NAME}\_FULL_OBJ_LIST) $init_obj \\
                \$($ctx->{NAME}_LINK_FLAGS)
 __EOD__


@@ -242,7 +242,7 @@ sub SharedLibrary($$)
 $ctx->{RESULT_SHARED_LIBRARY}: \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST)
        \@echo Linking \$\@
        \@mkdir -p $ctx->{SHAREDDIR}
 $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
                \$($ctx->{NAME}\_FULL_OBJ_LIST) \\
                \$($ctx->{NAME}_LINK_FLAGS) \\
                $soarg$lns

diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 82e32e1ece34a4c49d2ed8bd474e6ab4e3391d54..626349a45d37840d51fa344b597b7bab3a079212 100644 (file)
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -370,17 +370,11 @@ MANPAGE = man/locktest.1
 # End BINARY locktest
 #################################
 
 # End BINARY locktest
 #################################
 

-GCOV_FLAGS = --coverage
-

 COV_TARGET = test
 
 COV_VARS = \
 COV_TARGET = test
 
 COV_VARS = \

-       CFLAGS="$(CFLAGS) $(GCOV_FLAGS)" \
-       BNLD_FLAGS="$(BNLD_FLAGS) $(GCOV_FLAGS)" \
-       SHLD_FLAGS="$(SHLD_FLAGS) $(GCOV_FLAGS)" \
-       MDLD_FLAGS="$(MDLD_FLAGS) $(GCOV_FLAGS)" \
-       HOSTCC_FLAGS="$(HOSTCC_FLAGS) $(GCOV_FLAGS)" \
-       HOSTLD_FLAGS="$(HOSTLD_FLAGS) $(GCOV_FLAGS)"
+       CFLAGS="$(CFLAGS) --coverage" \
+       LDFLAGS="$(LDFLAGS) --coverage"

 
 test_cov:
        -$(MAKE) $(COV_TARGET) $(COV_VARS)
 
 test_cov:
        -$(MAKE) $(COV_TARGET) $(COV_VARS)