summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>2013-10-07 17:23:20 +0200
committerSylvestre Ledru <sylvestre.ledru@scilab-enterprises.com>2013-10-11 10:58:55 +0200
commit47c123279a4726263a50ef285a69b76583977a77 (patch)
treeabd42bc1550a7ef756adc8969e7da11f2da84e2c
parent76c57e74d40d615080d60b29ddfe9ee4c4ff54a2 (diff)
downloadscilab-47c123279a4726263a50ef285a69b76583977a77.zip
scilab-47c123279a4726263a50ef285a69b76583977a77.tar.gz
Fix a bug when using --disable-static-system-lib
Change-Id: I1d7d1dacc564324b3b33aa8455373c5fa3679da7
-rwxr-xr-xscilab/configure7
-rw-r--r--scilab/m4/compiler.m47
2 files changed, 14 insertions, 0 deletions
diff --git a/scilab/configure b/scilab/configure
index 50717d2..4e21b69 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -40835,6 +40835,13 @@ saved_LDFLAGS="$LDFLAGS"
40835compiler_manage_static_libs=no 40835compiler_manage_static_libs=no
40836USE_STATIC_SYSTEM_LIB=yes 40836USE_STATIC_SYSTEM_LIB=yes
40837 40837
40838
40839if test "x$enable_static_system_lib" == "xno"; then
40840# The user ask for an explicit disable.
40841 USE_STATIC_SYSTEM_LIB=no
40842fi
40843
40844
40838LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc" 40845LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc"
40839{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether g++ accepts -static-libstdc++ -static-libgcc" >&5 40846{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether g++ accepts -static-libstdc++ -static-libgcc" >&5
40840$as_echo_n "checking whether g++ accepts -static-libstdc++ -static-libgcc... " >&6; } 40847$as_echo_n "checking whether g++ accepts -static-libstdc++ -static-libgcc... " >&6; }
diff --git a/scilab/m4/compiler.m4 b/scilab/m4/compiler.m4
index dbd0180..150a283c 100644
--- a/scilab/m4/compiler.m4
+++ b/scilab/m4/compiler.m4
@@ -38,6 +38,13 @@ saved_LDFLAGS="$LDFLAGS"
38compiler_manage_static_libs=no 38compiler_manage_static_libs=no
39USE_STATIC_SYSTEM_LIB=yes 39USE_STATIC_SYSTEM_LIB=yes
40 40
41
42if test "x$enable_static_system_lib" == "xno"; then
43# The user ask for an explicit disable.
44 USE_STATIC_SYSTEM_LIB=no
45fi
46
47
41LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc" 48LDFLAGS="$LDFLAGS -static-libstdc++ -static-libgcc"
42AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc]) 49AC_MSG_CHECKING([whether g++ accepts -static-libstdc++ -static-libgcc])
43AC_LANG_PUSH(C++) 50AC_LANG_PUSH(C++)