mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-01-12 17:32:19 +00:00
Don't define LLVM_LIBDIR, it is not used anymore.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@183769 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
4cef3d8181
commit
add4c2fbb1
@ -1737,7 +1737,6 @@ if test "${prefix}" = "NONE" ; then
|
||||
fi
|
||||
eval LLVM_PREFIX="${prefix}";
|
||||
eval LLVM_BINDIR="${prefix}/bin";
|
||||
eval LLVM_LIBDIR="${prefix}/lib";
|
||||
eval LLVM_DATADIR="${prefix}/share/llvm";
|
||||
eval LLVM_DOCSDIR="${prefix}/share/doc/llvm";
|
||||
eval LLVM_ETCDIR="${prefix}/etc/llvm";
|
||||
@ -1747,7 +1746,6 @@ eval LLVM_MANDIR="${prefix}/man";
|
||||
LLVM_CONFIGTIME=`date`
|
||||
AC_SUBST(LLVM_PREFIX)
|
||||
AC_SUBST(LLVM_BINDIR)
|
||||
AC_SUBST(LLVM_LIBDIR)
|
||||
AC_SUBST(LLVM_DATADIR)
|
||||
AC_SUBST(LLVM_DOCSDIR)
|
||||
AC_SUBST(LLVM_ETCDIR)
|
||||
@ -1767,8 +1765,6 @@ AC_DEFINE_UNQUOTED(LLVM_PREFIX,"$LLVM_PREFIX",
|
||||
[Installation prefix directory])
|
||||
AC_DEFINE_UNQUOTED(LLVM_BINDIR, "$LLVM_BINDIR",
|
||||
[Installation directory for binary executables])
|
||||
AC_DEFINE_UNQUOTED(LLVM_LIBDIR, "$LLVM_LIBDIR",
|
||||
[Installation directory for libraries])
|
||||
AC_DEFINE_UNQUOTED(LLVM_DATADIR, "$LLVM_DATADIR",
|
||||
[Installation directory for data files])
|
||||
AC_DEFINE_UNQUOTED(LLVM_DOCSDIR, "$LLVM_DOCSDIR",
|
||||
@ -1828,7 +1824,7 @@ for a_binding in $BINDINGS_TO_BUILD ; do
|
||||
AC_SUBST(OCAML_LIBDIR,$ocaml_stdlib)
|
||||
else
|
||||
# ocaml stdlib is outside our prefix; use libdir/ocaml
|
||||
AC_SUBST(OCAML_LIBDIR,$LLVM_LIBDIR/ocaml)
|
||||
AC_SUBST(OCAML_LIBDIR,${prefix}/lib/ocaml)
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
|
17
configure
vendored
17
configure
vendored
@ -786,7 +786,6 @@ SHLIBEXT
|
||||
SHLIBPATH_VAR
|
||||
LLVM_PREFIX
|
||||
LLVM_BINDIR
|
||||
LLVM_LIBDIR
|
||||
LLVM_DATADIR
|
||||
LLVM_DOCSDIR
|
||||
LLVM_ETCDIR
|
||||
@ -10537,7 +10536,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10540 "configure"
|
||||
#line 10539 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -22308,7 +22307,6 @@ if test "${prefix}" = "NONE" ; then
|
||||
fi
|
||||
eval LLVM_PREFIX="${prefix}";
|
||||
eval LLVM_BINDIR="${prefix}/bin";
|
||||
eval LLVM_LIBDIR="${prefix}/lib";
|
||||
eval LLVM_DATADIR="${prefix}/share/llvm";
|
||||
eval LLVM_DOCSDIR="${prefix}/share/doc/llvm";
|
||||
eval LLVM_ETCDIR="${prefix}/etc/llvm";
|
||||
@ -22326,7 +22324,6 @@ LLVM_CONFIGTIME=`date`
|
||||
|
||||
|
||||
|
||||
|
||||
if test "${ENABLE_TIMESTAMPS}" = "0"; then
|
||||
LLVM_CONFIGTIME="(timestamp not enabled)"
|
||||
fi
|
||||
@ -22342,11 +22339,6 @@ cat >>confdefs.h <<_ACEOF
|
||||
_ACEOF
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define LLVM_LIBDIR "$LLVM_LIBDIR"
|
||||
_ACEOF
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define LLVM_DATADIR "$LLVM_DATADIR"
|
||||
_ACEOF
|
||||
@ -22434,7 +22426,7 @@ echo "$as_me: WARNING: --enable-bindings=ocaml specified, but ocamlopt not found
|
||||
|
||||
else
|
||||
# ocaml stdlib is outside our prefix; use libdir/ocaml
|
||||
OCAML_LIBDIR=$LLVM_LIBDIR/ocaml
|
||||
OCAML_LIBDIR=${prefix}/lib/ocaml
|
||||
|
||||
fi
|
||||
fi
|
||||
@ -23518,7 +23510,6 @@ SHLIBEXT!$SHLIBEXT$ac_delim
|
||||
SHLIBPATH_VAR!$SHLIBPATH_VAR$ac_delim
|
||||
LLVM_PREFIX!$LLVM_PREFIX$ac_delim
|
||||
LLVM_BINDIR!$LLVM_BINDIR$ac_delim
|
||||
LLVM_LIBDIR!$LLVM_LIBDIR$ac_delim
|
||||
LLVM_DATADIR!$LLVM_DATADIR$ac_delim
|
||||
LLVM_DOCSDIR!$LLVM_DOCSDIR$ac_delim
|
||||
LLVM_ETCDIR!$LLVM_ETCDIR$ac_delim
|
||||
@ -23528,6 +23519,7 @@ LLVM_MANDIR!$LLVM_MANDIR$ac_delim
|
||||
LLVM_CONFIGTIME!$LLVM_CONFIGTIME$ac_delim
|
||||
BINDINGS_TO_BUILD!$BINDINGS_TO_BUILD$ac_delim
|
||||
ALL_BINDINGS!$ALL_BINDINGS$ac_delim
|
||||
OCAML_LIBDIR!$OCAML_LIBDIR$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
|
||||
@ -23569,7 +23561,6 @@ _ACEOF
|
||||
ac_delim='%!_!# '
|
||||
for ac_last_try in false false false false false :; do
|
||||
cat >conf$$subs.sed <<_ACEOF
|
||||
OCAML_LIBDIR!$OCAML_LIBDIR$ac_delim
|
||||
ENABLE_VISIBILITY_INLINES_HIDDEN!$ENABLE_VISIBILITY_INLINES_HIDDEN$ac_delim
|
||||
RPATH!$RPATH$ac_delim
|
||||
RDYNAMIC!$RDYNAMIC$ac_delim
|
||||
@ -23578,7 +23569,7 @@ LIBOBJS!$LIBOBJS$ac_delim
|
||||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 7; then
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 6; then
|
||||
break
|
||||
elif $ac_last_try; then
|
||||
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||||
|
@ -597,9 +597,6 @@
|
||||
/* Installation directory for .info files */
|
||||
#cmakedefine LLVM_INFODIR "${LLVM_INFODIR}"
|
||||
|
||||
/* Installation directory for libraries */
|
||||
#cmakedefine LLVM_LIBDIR "${LLVM_LIBDIR}"
|
||||
|
||||
/* Installation directory for man pages */
|
||||
#cmakedefine LLVM_MANDIR "${LLVM_MANDIR}"
|
||||
|
||||
|
@ -602,9 +602,6 @@
|
||||
/* Installation directory for .info files */
|
||||
#undef LLVM_INFODIR
|
||||
|
||||
/* Installation directory for libraries */
|
||||
#undef LLVM_LIBDIR
|
||||
|
||||
/* Installation directory for man pages */
|
||||
#undef LLVM_MANDIR
|
||||
|
||||
|
@ -49,9 +49,6 @@
|
||||
/* Installation directory for .info files */
|
||||
#cmakedefine LLVM_INFODIR "${LLVM_INFODIR}"
|
||||
|
||||
/* Installation directory for libraries */
|
||||
#cmakedefine LLVM_LIBDIR "${LLVM_LIBDIR}"
|
||||
|
||||
/* Installation directory for man pages */
|
||||
#cmakedefine LLVM_MANDIR "${LLVM_MANDIR}"
|
||||
|
||||
|
@ -49,9 +49,6 @@
|
||||
/* Installation directory for .info files */
|
||||
#undef LLVM_INFODIR
|
||||
|
||||
/* Installation directory for libraries */
|
||||
#undef LLVM_LIBDIR
|
||||
|
||||
/* Installation directory for man pages */
|
||||
#undef LLVM_MANDIR
|
||||
|
||||
|
@ -1365,7 +1365,6 @@ if test "${prefix}" = "NONE" ; then
|
||||
fi
|
||||
eval LLVM_PREFIX="${prefix}";
|
||||
eval LLVM_BINDIR="${prefix}/bin";
|
||||
eval LLVM_LIBDIR="${prefix}/lib";
|
||||
eval LLVM_DATADIR="${prefix}/share/llvm";
|
||||
eval LLVM_DOCSDIR="${prefix}/share/doc/llvm";
|
||||
eval LLVM_ETCDIR="${prefix}/etc/llvm";
|
||||
@ -1375,7 +1374,6 @@ eval LLVM_MANDIR="${prefix}/man";
|
||||
LLVM_CONFIGTIME=`date`
|
||||
AC_SUBST(LLVM_PREFIX)
|
||||
AC_SUBST(LLVM_BINDIR)
|
||||
AC_SUBST(LLVM_LIBDIR)
|
||||
AC_SUBST(LLVM_DATADIR)
|
||||
AC_SUBST(LLVM_DOCSDIR)
|
||||
AC_SUBST(LLVM_ETCDIR)
|
||||
@ -1390,8 +1388,6 @@ AC_DEFINE_UNQUOTED(LLVM_PREFIX,"$LLVM_PREFIX",
|
||||
[Installation prefix directory])
|
||||
AC_DEFINE_UNQUOTED(LLVM_BINDIR, "$LLVM_BINDIR",
|
||||
[Installation directory for binary executables])
|
||||
AC_DEFINE_UNQUOTED(LLVM_LIBDIR, "$LLVM_LIBDIR",
|
||||
[Installation directory for libraries])
|
||||
AC_DEFINE_UNQUOTED(LLVM_DATADIR, "$LLVM_DATADIR",
|
||||
[Installation directory for data files])
|
||||
AC_DEFINE_UNQUOTED(LLVM_DOCSDIR, "$LLVM_DOCSDIR",
|
||||
@ -1449,7 +1445,7 @@ for a_binding in $BINDINGS_TO_BUILD ; do
|
||||
AC_SUBST(OCAML_LIBDIR,$ocaml_stdlib)
|
||||
else
|
||||
# ocaml stdlib is outside our prefix; use libdir/ocaml
|
||||
AC_SUBST(OCAML_LIBDIR,$LLVM_LIBDIR/ocaml)
|
||||
AC_SUBST(OCAML_LIBDIR,${prefix}/lib/ocaml)
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
|
15
projects/sample/configure
vendored
15
projects/sample/configure
vendored
@ -772,7 +772,6 @@ SHLIBEXT
|
||||
SHLIBPATH_VAR
|
||||
LLVM_PREFIX
|
||||
LLVM_BINDIR
|
||||
LLVM_LIBDIR
|
||||
LLVM_DATADIR
|
||||
LLVM_DOCSDIR
|
||||
LLVM_ETCDIR
|
||||
@ -10363,7 +10362,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10366 "configure"
|
||||
#line 10365 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -20702,7 +20701,6 @@ if test "${prefix}" = "NONE" ; then
|
||||
fi
|
||||
eval LLVM_PREFIX="${prefix}";
|
||||
eval LLVM_BINDIR="${prefix}/bin";
|
||||
eval LLVM_LIBDIR="${prefix}/lib";
|
||||
eval LLVM_DATADIR="${prefix}/share/llvm";
|
||||
eval LLVM_DOCSDIR="${prefix}/share/doc/llvm";
|
||||
eval LLVM_ETCDIR="${prefix}/etc/llvm";
|
||||
@ -20720,7 +20718,6 @@ LLVM_CONFIGTIME=`date`
|
||||
|
||||
|
||||
|
||||
|
||||
# Place the various directores into the config.h file as #defines so that we
|
||||
# can know about the installation paths within LLVM.
|
||||
|
||||
@ -20734,11 +20731,6 @@ cat >>confdefs.h <<_ACEOF
|
||||
_ACEOF
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define LLVM_LIBDIR "$LLVM_LIBDIR"
|
||||
_ACEOF
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
#define LLVM_DATADIR "$LLVM_DATADIR"
|
||||
_ACEOF
|
||||
@ -20825,7 +20817,7 @@ echo "$as_me: WARNING: --enable-bindings=ocaml specified, but ocamlopt not found
|
||||
|
||||
else
|
||||
# ocaml stdlib is outside our prefix; use libdir/ocaml
|
||||
OCAML_LIBDIR=$LLVM_LIBDIR/ocaml
|
||||
OCAML_LIBDIR=${prefix}/lib/ocaml
|
||||
|
||||
fi
|
||||
fi
|
||||
@ -21826,7 +21818,6 @@ SHLIBEXT!$SHLIBEXT$ac_delim
|
||||
SHLIBPATH_VAR!$SHLIBPATH_VAR$ac_delim
|
||||
LLVM_PREFIX!$LLVM_PREFIX$ac_delim
|
||||
LLVM_BINDIR!$LLVM_BINDIR$ac_delim
|
||||
LLVM_LIBDIR!$LLVM_LIBDIR$ac_delim
|
||||
LLVM_DATADIR!$LLVM_DATADIR$ac_delim
|
||||
LLVM_DOCSDIR!$LLVM_DOCSDIR$ac_delim
|
||||
LLVM_ETCDIR!$LLVM_ETCDIR$ac_delim
|
||||
@ -21844,7 +21835,7 @@ LIBOBJS!$LIBOBJS$ac_delim
|
||||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
|
||||
break
|
||||
elif $ac_last_try; then
|
||||
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||||
|
Loading…
x
Reference in New Issue
Block a user