Check-in [e8e77fe250]
Overview
Comment:Added an LDFLAGS_ADD environment variable to add options to the end of the linking command line
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:e8e77fe2505c8cc157e2a1551ccca26c7e85ddbe
User & Date: rkeene on 2012-07-14 23:29:59
Other Links: manifest | tags
Context
2012-07-14
23:30
Fixed missing export check-in: 9467bd623b user: rkeene tags: trunk
23:29
Added an LDFLAGS_ADD environment variable to add options to the end of the linking command line check-in: e8e77fe250 user: rkeene tags: trunk
23:23
Updated to allow setting variables for individual sub-projects check-in: 9fce84fc29 user: rkeene tags: trunk
Changes

Modified kitsh/build.sh from [440fd45f77] to [462ca525a2].

    15     15   BUILDDIR="$(pwd)/build/kitsh-${KITSHVERS}"
    16     16   OUTDIR="$(pwd)/out"
    17     17   INSTDIR="$(pwd)/inst"
    18     18   OTHERPKGSDIR="$(pwd)/../"
    19     19   export KITSHVERS BUILDDIR OUTDIR INSTDIR OTHERPKGSDIR
    20     20   
    21     21   # Set configure options for this sub-project
           22  +LDFLAGS_ADD="${KC_KITSH_LDFLAGS_ADD}"
    22     23   LDFLAGS="${KC_KITSH_LDFLAGS}"
    23     24   CFLAGS="${KC_KITSH_CFLAGS}"
    24     25   CPPFLAGS="${KC_KITSH_CPPFLAGS}"
    25     26   LIBS="${KC_KITSH_LIBS}"
    26     27   export LDFLAGS CFLAGS CPPFLAGS LIBS
    27     28   
    28     29   if [ -z "${ENABLECOMPRESSION}" ]; then

Modified kitsh/buildsrc/kitsh-0.0/Makefile.common.in from [89e8fa6548] to [79dfb5dde5].

    10     10   ARCHS = @ARCHS@
    11     11   STRIPLIBS = @STRIPLIBS@ @EXTRA_OBJS@
    12     12   EXTRA_OBJS = @EXTRA_OBJS@
    13     13   LDRUNPATH = @LDRUNPATH@
    14     14   EXTRA_KIT_DEPS = @EXTRA_KIT_DEPS@
    15     15   EXTRA_VFS_OBJS = @EXTRA_VFS_OBJS@
    16     16   TCLSH_NATIVE = tclsh
           17  +LDFLAGS_ADD = @LDFLAGS_ADD@
    17     18   
    18     19   # Build targets
    19     20   ## VFS Build
    20     21   cvfs_data_tcl.o: cvfs_data_tcl.c
    21     22   cvfs_data_tcl.c: dir2c.tcl starpack.vfs cvfs_data.c
    22     23   	"$(TCLSH_NATIVE)" dir2c.tcl tcl starpack.vfs > cvfs_data_tcl.c
    23     24   

Modified kitsh/buildsrc/kitsh-0.0/Makefile.kitdll.in from [903bfeecb6] to [05829b4d07].

     3      3   # Default target
     4      4   all: libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@
     5      5   
     6      6   -include Makefile.common
     7      7   
     8      8   ## DLL Build
     9      9   libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@: $(OBJS) $(EXTRA_KIT_DEPS) $(EXTRA_OBJS) $(EXTRA_VFS_OBJS)
    10         -	$(CC) $(CPPFLAGS) $(CFLAGS) -o libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@ $(OBJS) $(EXTRA_OBJS) $(EXTRA_VFS_OBJS) $(LDFLAGS) $(SHOBJLDFLAGS) @WHOLEARCHIVE@ $(ARCHS) @NOWHOLEARCHIVE@ $(LIBS)
           10  +	$(CC) $(CPPFLAGS) $(CFLAGS) -o libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@ $(OBJS) $(EXTRA_OBJS) $(EXTRA_VFS_OBJS) $(LDFLAGS) $(SHOBJLDFLAGS) @WHOLEARCHIVE@ $(ARCHS) @NOWHOLEARCHIVE@ $(LIBS) $(LDFLAGS_ADD)
    11     11   	-for striplib in $(STRIPLIBS); do $(OBJCOPY) --weaken "$${striplib}"; done
    12     12   	-mv libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@ libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@.safe; \
    13     13   		$(CC) $(CPPFLAGS) $(CFLAGS) -o libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@ $(OBJS) $(EXTRA_OBJS) $(EXTRA_VFS_OBJS) $(LDFLAGS) $(SHOBJLDFLAGS) @WHOLEARCHIVE@ $(ARCHS) @NOWHOLEARCHIVE@ $(LIBS) || \
    14     14   			mv libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@.safe libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@
    15     15   	-rm -f libtclkit@KITDLL_LIB_VERSION@.@SHOBJEXT@.safe
    16     16   
    17     17   # Test driver

Modified kitsh/buildsrc/kitsh-0.0/Makefile.tclkit.in from [9a850eafbd] to [846104f661].

     1      1   OBJS = kitInit.o main.o pwb.o rechan.o zlib.o winMain.o
     2      2   
     3      3   all: kit
     4      4   
     5      5   -include Makefile.common
     6      6   
     7      7   kit: $(OBJS) $(EXTRA_OBJS) $(EXTRA_KIT_DEPS) $(EXTRA_VFS_OBJS) $(ARCHS)
     8         -	$(CC) $(CPPFLAGS) $(CFLAGS) -o kit $(OBJS) $(EXTRA_OBJS) $(EXTRA_VFS_OBJS) $(ARCHS) $(LDFLAGS) $(LIBS)
            8  +	$(CC) $(CPPFLAGS) $(CFLAGS) -o kit $(OBJS) $(EXTRA_OBJS) $(EXTRA_VFS_OBJS) $(ARCHS) $(LDFLAGS) $(LIBS) $(LDFLAGS_ADD)

Modified kitsh/buildsrc/kitsh-0.0/configure.ac from [651eab0d38] to [f213e421dc].

   188    188   		dnl Add appropriate dependencies
   189    189   		EXTRA_KIT_DEPS="cvfs.tcl.h"
   190    190   		EXTRA_VFS_OBJS="${EXTRA_VFS_OBJS} cvfs_data_tcl.o"
   191    191   	]
   192    192   )
   193    193   
   194    194   AC_SUBST(EXTRA_KIT_DEPS)
          195  +AC_SUBST(LDFLAGS_ADD)
   195    196   
   196    197   dnl Put correct Makefile template in place
   197    198   rm -f Makefile.in
   198    199   cp Makefile.${TARGET}.in Makefile.in
   199    200   
   200    201   dnl Produce output
   201    202   AC_OUTPUT(Makefile Makefile.common)