summaryrefslogtreecommitdiffstats
path: root/scilab/configure.ac
diff options
context:
space:
mode:
authorCedric Delamarre <cedric.delamarre@scilab-enterprises.com>2015-04-14 12:18:37 +0200
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>2015-04-22 14:57:02 +0100
commit0b6827d11eaedeacf575892e1d7467fb82435537 (patch)
tree29defdbdfcab9030589fe88db814ac34e3ad872e /scilab/configure.ac
parent2ad05510b97794248bc464759b83de6db9e83a63 (diff)
downloadscilab-0b6827d11eaedeacf575892e1d7467fb82435537.zip
scilab-0b6827d11eaedeacf575892e1d7467fb82435537.tar.gz
Intel compiler on Linux
Change-Id: Ic9247da37721b1280128faa3c7713ddc2880fb85
Diffstat (limited to 'scilab/configure.ac')
-rw-r--r--scilab/configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/scilab/configure.ac b/scilab/configure.ac
index f402f07..a22362e 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -548,7 +548,7 @@ case "$CXX" in
548 else 548 else
549 DEBUG_CXXFLAGS="-DNDEBUG" 549 DEBUG_CXXFLAGS="-DNDEBUG"
550 fi 550 fi
551 COMPILER_CXXFLAGS="-fno-stack-protector " # bug 3131 551 COMPILER_CXXFLAGS="$COMPILER_CXXFLAGS -fno-stack-protector " # bug 3131
552 ;; 552 ;;
553 553
554esac 554esac
@@ -588,7 +588,7 @@ case "$CC" in
588 DEBUG_CFLAGS="-DNDEBUG" 588 DEBUG_CFLAGS="-DNDEBUG"
589 fi 589 fi
590 590
591 COMPILER_CFLAGS="-fno-stack-protector " # bug 3131 591 COMPILER_CFLAGS="$COMPILER_CFLAGS -fno-stack-protector " # bug 3131
592 # Explictly disable the as needed. It was disable by default but Ubuntu 592 # Explictly disable the as needed. It was disable by default but Ubuntu
593 # activated it by default since release 11.04. See bug #8961. 593 # activated it by default since release 11.04. See bug #8961.
594 # Once all cyclic dependencies have been dropped, this line could be removed. 594 # Once all cyclic dependencies have been dropped, this line could be removed.