diff options
| author | Tom Stellard <thomas.stellard@amd.com> | 2014-01-29 20:03:26 +0000 |
|---|---|---|
| committer | Tom Stellard <thomas.stellard@amd.com> | 2014-01-29 20:03:26 +0000 |
| commit | 91d51db80065a692a5f1a371ad7717f6f2ee3189 (patch) | |
| tree | 68e0795767a9941d2c72fdab043954697d01aab5 /libclc/configure.py | |
| parent | ac0fb621cef63422ebec88e73f548a033dee93cc (diff) | |
| download | bcm5719-llvm-91d51db80065a692a5f1a371ad7717f6f2ee3189.tar.gz bcm5719-llvm-91d51db80065a692a5f1a371ad7717f6f2ee3189.zip | |
Fixed ninja build issues relating to use of $(DESTDIR)
We use ${DESTDIR} syntax now instead of $(DESTDIR) because that syntax
works both is the shell (at least it does for bash) and for make (at
least it does for GNU Make)
Patch By: Dan Liew
llvm-svn: 200414
Diffstat (limited to 'libclc/configure.py')
| -rwxr-xr-x | libclc/configure.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libclc/configure.py b/libclc/configure.py index 8a493978b27..525fdbeeaf4 100755 --- a/libclc/configure.py +++ b/libclc/configure.py @@ -220,15 +220,15 @@ for target in targets: b.default(builtins_bc) -install_cmd = ' && '.join(['mkdir -p $(DESTDIR)/%(dst)s && cp -r %(src)s $(DESTDIR)/%(dst)s' % +install_cmd = ' && '.join(['mkdir -p ${DESTDIR}/%(dst)s && cp -r %(src)s ${DESTDIR}/%(dst)s' % {'src': file, 'dst': libexecdir} for (file, dest) in install_files_bc]) -install_cmd = ' && '.join(['%(old)s && mkdir -p $(DESTDIR)/%(dst)s && cp -r %(srcdir)s/generic/include/clc $(DESTDIR)/%(dst)s' % +install_cmd = ' && '.join(['%(old)s && mkdir -p ${DESTDIR}/%(dst)s && cp -r %(srcdir)s/generic/include/clc ${DESTDIR}/%(dst)s' % {'old': install_cmd, 'dst': includedir, 'srcdir': srcdir}]) -install_cmd = ' && '.join(['%(old)s && mkdir -p $(DESTDIR)/%(dst)s && cp -r libclc.pc $(DESTDIR)/%(dst)s' % +install_cmd = ' && '.join(['%(old)s && mkdir -p ${DESTDIR}/%(dst)s && cp -r libclc.pc ${DESTDIR}/%(dst)s' % {'old': install_cmd, 'dst': pkgconfigdir}]) |
