# HG changeset patch # User Anirudha Bose # Date 1379952116 -19800 # Node ID 51095550ab4623fee611cd79f70b16ae3671a8b1 # Parent 92fc1c2cb9755f7fb6c8709447fdfe573d6845de [Darwin] Remove obsolete LDFLAG -rpath during Qt compilation diff --git a/src/octave.mk b/src/octave.mk --- 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) \ diff --git a/src/qt.mk b/src/qt.mk --- 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)