# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1507802088 14400
# Node ID f3d64fe692e65cfb1f6e1a27c7a16e745520ac2f
# Parent  e8da760989bca02cd9ae4ec6b583beb33c46d71f
octave-wrapper.in: Include GCC library directory in LD_LIBRARY_PATH.

diff -r e8da760989bc -r f3d64fe692e6 binary-dist-rules.mk
--- 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 \
diff -r e8da760989bc -r f3d64fe692e6 octave-wrapper.in
--- 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"