Mercurial > hg > mxe-octave-anirudha

changeset 3230:51095550ab46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[Darwin] Remove obsolete LDFLAG -rpath during Qt compilation
author Anirudha Bose <ani07nov@gmail.com>
date Mon, 23 Sep 2013 21:31:56 +0530
parents 92fc1c2cb975
children 3f87daaad087
files src/octave.mk src/qt.mk
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/octave.mk
+++ b/src/octave.mk
@@ -89,6 +89,7 @@
 	$(MINGW_JAVA_CONFIG_OPTIONS) \
 	$($(PKG)_DARWIN_EXTRA_CONFIG_OPTIONS) \
 	--enable-docs \
+	--disable-gui \
         $($(PKG)_BLAS_OPTION) \
 	$($(PKG)_CROSS_CONFIG_OPTIONS) \
         $($(PKG)_ENABLE_64_CONFIGURE_OPTIONS) \
--- a/src/qt.mk
+++ b/src/qt.mk
@@ -37,8 +37,13 @@
   # compile-in generic ODBC driver under Windows
   $(PKG)_CONFIGURE_DATABASE_OPTION += -plugin-sql-odbc
 else
-  $(PKG)_CONFIGURE_ENV += \
-    LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR)'
+  ifeq ($(MXE_SYSTEM),darwin)
+    $(PKG)_CONFIGURE_ENV += \
+      LDFLAGS='-Wl,-L$(HOST_LIBDIR)'
+  else
+    $(PKG)_CONFIGURE_ENV += \
+      LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR)'
+  endif
 endif
 
 ifeq ($(MXE_NATIVE_BUILD),yes)