diff options
| author | Steve Bennett <steveb@workware.net.au> | 2014-11-28 09:56:03 +1000 |
|---|---|---|
| committer | Steve Bennett <steveb@workware.net.au> | 2014-11-28 15:37:58 +1000 |
| commit | 4a7c05835e2cf52526a6d8de5b3fc446fb3dbbf9 (patch) | |
| tree | cef2c745bd8fd0414d7bc8fda1da74582a954852 /auto.def | |
| parent | 77329fbe453beddd11607fa437ae83940435e1a4 (diff) | |
| download | jimtcl-4a7c05835e2cf52526a6d8de5b3fc446fb3dbbf9.zip jimtcl-4a7c05835e2cf52526a6d8de5b3fc446fb3dbbf9.tar.gz jimtcl-4a7c05835e2cf52526a6d8de5b3fc446fb3dbbf9.tar.bz2 | |
Keep $LIBS as user-specified libraries only
Normally detected libraries are automatically added to $LIBS, but we
use $LDLIBS to build the list of libraries. So don't add these
libraries to $LIBS to avoid duplicates.
Signed-off-by: Steve Bennett <steveb@workware.net.au>
Diffstat (limited to 'auto.def')
| -rw-r--r-- | auto.def | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -66,6 +66,10 @@ options { install-jim=1 } +# Save the user-specified LIBS +# We add detected libs to LDLIBS explicitly +set LIBS [get-define LIBS] + cc-check-types "long long" define CCOPTS "" @@ -343,6 +347,9 @@ define C_EXT_SHOBJS [suffix .so $extinfo(module-c)] define TCL_EXTS [suffix .tcl $extinfo(module-tcl)] define EXTRA_OBJS $extra_objs +# Restore the user-specified LIBS +define LIBS $LIBS + make-config-header jim-config.h -auto {HAVE_LONG_LONG* JIM_UTF8} -bare JIM_VERSION -none * make-config-header jimautoconf.h -auto {jim_ext_* TCL_PLATFORM_* TCL_LIBRARY USE_* JIM_* _FILE_OFFSET*} make-template Makefile.in |