summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorKelly Thompson <KineticTheory@users.noreply.github.com>2016-11-12 21:46:59 -0700
committerTodd Gamblin <tgamblin@llnl.gov>2016-11-12 21:46:59 -0700
commit05c6c40e36b340e9489313eb1538a5d3e0b72c89 (patch)
tree95e09d5daa6fbb66d2ecd4805ba8cc2dab12cb54 /var
parent8c0c3263e282d95517f251b5c6e357f27e26d179 (diff)
downloadspack-05c6c40e36b340e9489313eb1538a5d3e0b72c89.tar.gz
spack-05c6c40e36b340e9489313eb1538a5d3e0b72c89.tar.bz2
spack-05c6c40e36b340e9489313eb1538a5d3e0b72c89.tar.xz
spack-05c6c40e36b340e9489313eb1538a5d3e0b72c89.zip
Force the recipe for Lua to use the spack compiler. (#2299)
* Force the recipe for Lua to use the spack compiler. I'm not sure how the old recipe worked for anyone. The Lua Makefiles set `CC=gcc` and for my spack environment the first `gcc` found in my `PATH` is `$SPACK_ROOT/lib/spack/env/gcc`, which is a directory. This caused the build to fail. My change drops the `-std=gnu99`, but this option doesn't appear to be required for a sucessful build. * Preserve the '-std=gnu99' compile option.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/lua/package.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/lua/package.py b/var/spack/repos/builtin/packages/lua/package.py
index ca0a481a83..4da2c99e04 100644
--- a/var/spack/repos/builtin/packages/lua/package.py
+++ b/var/spack/repos/builtin/packages/lua/package.py
@@ -62,16 +62,18 @@ class Lua(Package):
else:
target = 'linux'
make('INSTALL_TOP=%s' % prefix,
- 'MYLDFLAGS=-L%s -L%s ' % (
+ 'MYLDFLAGS=-L%s -L%s' % (
spec['readline'].prefix.lib,
spec['ncurses'].prefix.lib),
'MYLIBS=-lncurses',
+ 'CC=%s -std=gnu99' % spack_cc,
target)
make('INSTALL_TOP=%s' % prefix,
- 'MYLDFLAGS=-L%s -L%s ' % (
+ 'MYLDFLAGS=-L%s -L%s' % (
spec['readline'].prefix.lib,
spec['ncurses'].prefix.lib),
'MYLIBS=-lncurses',
+ 'CC=%s -std=gnu99' % spack_cc,
'install')
with working_dir(os.path.join('luarocks', 'luarocks')):