Mercurial > mxe-octave
changeset 4506:f3d64fe692e6
octave-wrapper.in: Include GCC library directory in LD_LIBRARY_PATH.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 12 Oct 2017 05:54:48 -0400 |
parents | e8da760989bc |
children | 4c645e979279 |
files | binary-dist-rules.mk octave-wrapper.in |
diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/binary-dist-rules.mk Thu Oct 12 04:44:14 2017 -0400 +++ b/binary-dist-rules.mk Thu Oct 12 05:54:48 2017 -0400 @@ -149,6 +149,8 @@ mv $(OCTAVE_DIST_DIR)/bin/$$f-$($(OCTAVE_TARGET)_VERSION) \ $(OCTAVE_DIST_DIR)/bin/$$f-$($(OCTAVE_TARGET)_VERSION).real; \ $(SED) < octave-wrapper.in \ + -e "s|@GCC_VERSION@|$(native-gcc_VERSION)|" \ + -e "s|@GCC_ARCH@|$(TARGET)|" \ -e "s|@OCTAVE_VERSION@|$($(OCTAVE_TARGET)_VERSION)|" \ -e "s|@GNUPLOT_MAJOR_MINOR_VERSION@|$(shell echo $(gnuplot_VERSION) | $(SED) -e 's/\(^[0-9][0-9]*\.[0-9][0-9]*\)\..*/\1/')|" \ -e "s|@PROGRAM_NAME@|$$f|" > $$f-t \
--- a/octave-wrapper.in Thu Oct 12 04:44:14 2017 -0400 +++ b/octave-wrapper.in Thu Oct 12 05:54:48 2017 -0400 @@ -9,7 +9,11 @@ PATH="$OCTAVE_HOME/bin/:$PATH" -LD_LIBRARY_PATH="$OCTAVE_HOME/lib:$OCTAVE_HOME/lib64:$OCTAVE_HOME/lib/octave/@OCTAVE_VERSION@" +GCC_VERSION="@GCC_VERSION@" +GCC_ARCH="@GCC_ARCH@" +GCC_LIB_DIR="$OCTAVE_HOME/lib/gcc/$GCC_ARCH/$GCC_VERSION" + +LD_LIBRARY_PATH="$OCTAVE_HOME/lib:$OCTAVE_HOME/lib64:$OCTAVE_HOME/lib/octave/@OCTAVE_VERSION@:$GCC_LIB_DIR" TERMINFO="$OCTAVE_HOME/share/terminfo"