summaryrefslogtreecommitdiffstats
path: root/scilab/modules/dynamic_link
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-03-30 11:35:22 +0200
committerAllan CORNET <allan.cornet@scilab.org>2010-03-30 11:35:22 +0200
commit42a5f61faed9cc77d966144a7e553468f810aba8 (patch)
treefdcd6beac454d2a4c792509a50705d1d0a879582 /scilab/modules/dynamic_link
parentacdaed72988b395486aa08b379c8fa4ea565e84a (diff)
parent8d24838f4eb83c4722f634abddbeab418b0e77a9 (diff)
downloadscilab-42a5f61faed9cc77d966144a7e553468f810aba8.zip
scilab-42a5f61faed9cc77d966144a7e553468f810aba8.tar.gz
Merge remote branch 'refs/remotes/origin/5.2'
Diffstat (limited to 'scilab/modules/dynamic_link')
-rw-r--r--scilab/modules/dynamic_link/macros/gencompilationflags_unix.sci7
1 files changed, 4 insertions, 3 deletions
diff --git a/scilab/modules/dynamic_link/macros/gencompilationflags_unix.sci b/scilab/modules/dynamic_link/macros/gencompilationflags_unix.sci
index bd8932f..85764d0 100644
--- a/scilab/modules/dynamic_link/macros/gencompilationflags_unix.sci
+++ b/scilab/modules/dynamic_link/macros/gencompilationflags_unix.sci
@@ -33,9 +33,10 @@ function cmd = gencompilationflags_unix(ldflags, cflags, fflags, cc)
33 end 33 end
34 34
35 // LDFLAGS 35 // LDFLAGS
36 if ldflags <> '' then 36 // Do not set the LDFLAGS See bug #4787
37 cmd = cmd +" LDFLAGS="""+ldflags+"""" 37 // if ldflags <> '' then
38 end 38 // cmd = cmd +" LDFLAGS="""+ldflags+""""
39 // end
39 40
40 // FFLAGS 41 // FFLAGS
41 if fflags <> '' then 42 if fflags <> '' then