Mercurial > octave

changeset 25597:6e6b5e85e08a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: delete empty unused LLVM_CXXFLAGS build variable * configure.ac: Delete unused build configuration variable LLVM_CXXFLAGS. * libinterp/corefcn/module.mk (%canon_reldir%_libcorefcn_la_CXXFLAGS): Delete variable. * libinterp/parse-tree/module.mk (%canon_reldir%_libparse_tree_la_CXXFLAGS): Delete variable.
author Mike Miller <mtmiller@octave.org>
date Thu, 12 Jul 2018 16:37:22 -0700
parents e65dc7a2de42
children 8090a118eb03
files configure.ac libinterp/corefcn/module.mk libinterp/parse-tree/module.mk
diffstat 3 files changed, 0 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Thu Jul 12 16:36:28 2018 -0700
+++ b/configure.ac	Thu Jul 12 16:37:22 2018 -0700
@@ -1406,7 +1406,6 @@
     [(EXPERIMENTAL) enable JIT compiler])],
   [if test "$enableval" = yes; then ENABLE_JIT=yes; fi], [])
 
-LLVM_CXXFLAGS=
 LLVM_CPPFLAGS=
 LLVM_LDFLAGS=
 LLVM_LIBS=
@@ -1424,7 +1423,6 @@
     warn_llvm="LLVM was not found or is to old.  JIT compiler is disabled."
 
     save_CPPFLAGS="$CPPFLAGS"
-    save_CXXFLAGS="$CXXFLAGS"
     save_LDFLAGS="$LDFLAGS"
 
     dnl Use -isystem if available because we don't want to see warnings in LLVM
@@ -1435,7 +1433,6 @@
 
     dnl Use -isystem so we don't get warnings from llvm headers
     LLVM_CPPFLAGS="$LLVM_INCLUDE_FLAG `$LLVM_CONFIG --includedir`"
-    LLVM_CXXFLAGS=
     LLVM_LDFLAGS="-L`$LLVM_CONFIG --libdir`"
 
     LDFLAGS="$LDFLAGS $LLVM_LDFLAGS"
@@ -1447,7 +1444,6 @@
     dnl Ideally we should get these from llvm-config, but llvm-config isn't
     dnl very helpful.
     CPPFLAGS="-D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS $LLVM_CPPFLAGS $CPPFLAGS"
-    CXXFLAGS="$LLVM_CXXFLAGS $CXXFLAGS"
     AC_LANG_PUSH(C++)
     AC_CHECK_HEADER([llvm/Support/TargetSelect.h], [warn_llvm=""])
 
@@ -1480,7 +1476,6 @@
     OCTAVE_LLVM_LEGACY_PASSMANAGER_API
     AC_LANG_POP(C++)
     CPPFLAGS="$save_CPPFLAGS"
-    CXXFLAGS="$save_CXXFLAGS"
     LDFLAGS="$save_LDFLAGS"
   fi
 
@@ -1489,7 +1484,6 @@
   else
     ENABLE_JIT=no
     LLVM_CPPFLAGS=
-    LLVM_CXXFLAGS=
     LLVM_LDFLAGS=
     LLVM_LIBS=
     OCTAVE_CONFIGURE_WARNING([warn_llvm])
@@ -1505,7 +1499,6 @@
 fi
 
 AC_SUBST(LLVM_CPPFLAGS)
-AC_SUBST(LLVM_CXXFLAGS)
 AC_SUBST(LLVM_LDFLAGS)
 AC_SUBST(LLVM_LIBS)
 AM_CONDITIONAL([AMCOND_HAVE_LLVM], [test -z "$warn_llvm"])
--- a/libinterp/corefcn/module.mk	Thu Jul 12 16:36:28 2018 -0700
+++ b/libinterp/corefcn/module.mk	Thu Jul 12 16:37:22 2018 -0700
@@ -316,8 +316,6 @@
   $(LLVM_CPPFLAGS) \
   $(Z_CPPFLAGS)
 
-%canon_reldir%_libcorefcn_la_CXXFLAGS = $(AM_CXXFLAGS) $(LLVM_CXXFLAGS)
-
 libinterp_EXTRA_DIST += \
   %reldir%/default-defs.in.h \
   %reldir%/genprops.awk \
--- a/libinterp/parse-tree/module.mk	Thu Jul 12 16:36:28 2018 -0700
+++ b/libinterp/parse-tree/module.mk	Thu Jul 12 16:37:22 2018 -0700
@@ -116,10 +116,6 @@
   $(libinterp_liboctinterp_la_CPPFLAGS) \
   $(LLVM_CPPFLAGS)
 
-%canon_reldir%_libparse_tree_la_CXXFLAGS = \
-  $(AM_CXXFLAGS) \
-  $(LLVM_CXXFLAGS)
-
 libinterp_EXTRA_DIST += \
   %reldir%/oct-parse.in.yy \
   %reldir%/octave.gperf