Mercurial > mxe-octave

comparison Makefile.in @ 3226:c56f388f1297

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make using lib64 directory configurable
author John W. Eaton <jwe@octave.org>
date Thu, 08 Aug 2013 12:19:35 -0400
parents df75a174b366
children c0f577fc5d4a
comparison
equal deleted inserted replaced
3225:7e6673cf2255 3226:c56f388f1297
44 # Attempt to build LLVM and enable Octave's experimental JIT compiler. 44 # Attempt to build LLVM and enable Octave's experimental JIT compiler.
45 ENABLE_JIT := @ENABLE_JIT@ 45 ENABLE_JIT := @ENABLE_JIT@
46 46
47 # Use openblas for octave 47 # Use openblas for octave
48 ENABLE_OPENBLAS := @ENABLE_OPENBLAS@ 48 ENABLE_OPENBLAS := @ENABLE_OPENBLAS@
49
50 # Look in lib64 directory.
51 MXE_USE_LIB64_DIRECTORY := @ENABLE_LIB64_DIRECTORY@
49 52
50 ## end of configuration variables. 53 ## end of configuration variables.
51 54
52 ifneq ($(MXE_NATIVE_BUILD),yes) 55 ifneq ($(MXE_NATIVE_BUILD),yes)
53 ifeq ($(MXE_SYSTEM),msvc) 56 ifeq ($(MXE_SYSTEM),msvc)
161 PKGS := $(filter-out $(ALL_BUILD_TOOLS), $(shell $(SED) -n 's/^.* id="\([^"]*\)-package">.*$$/\1/p' '$(TOP_DIR)/index.html')) 164 PKGS := $(filter-out $(ALL_BUILD_TOOLS), $(shell $(SED) -n 's/^.* id="\([^"]*\)-package">.*$$/\1/p' '$(TOP_DIR)/index.html'))
162 165
163 PATH := $(BUILD_TOOLS_PREFIX)/bin:$(PATH) 166 PATH := $(BUILD_TOOLS_PREFIX)/bin:$(PATH)
164 167
165 CONFIGURE_CPPFLAGS := CPPFLAGS='-I$(HOST_PREFIX)/include' 168 CONFIGURE_CPPFLAGS := CPPFLAGS='-I$(HOST_PREFIX)/include'
166 CONFIGURE_LDFLAGS := LDFLAGS='-L$(HOST_PREFIX)/lib' 169 ifeq ($(MXE_USE_LIB64_DIRECTORY),yes)
170 CONFIGURE_LDFLAGS := LDFLAGS='-L$(HOST_PREFIX)/lib -L$(HOST_PREFIX)/lib64'
171 else
172 CONFIGURE_LDFLAGS := LDFLAGS='-L$(HOST_PREFIX)/lib'
173 endif
167 CONFIGURE_POST_HOOK := true 174 CONFIGURE_POST_HOOK := true
168 175
169 ifeq ($(MXE_NATIVE_BUILD),yes) 176 ifeq ($(MXE_NATIVE_BUILD),yes)
170 MXE_TOOL_PREFIX := 177 MXE_TOOL_PREFIX :=
171 ifeq ($(MXE_SYSTEM),msvc) 178 ifeq ($(MXE_SYSTEM),msvc)
249 MSYS_BASE_PACKAGES := $(addprefix msys-,bash coreutils diffutils file findutils gawk grep gzip less libiconv libintl libmagic make msys-core regex sed tar termcap) 256 MSYS_BASE_PACKAGES := $(addprefix msys-,bash coreutils diffutils file findutils gawk grep gzip less libiconv libintl libmagic make msys-core regex sed tar termcap)
250 257
251 NOTEPAD_BASE_DIR := $(TOP_DIR)/notepad++ 258 NOTEPAD_BASE_DIR := $(TOP_DIR)/notepad++
252 endif 259 endif
253 else ifneq ($(MXE_SYSTEM),msvc) 260 else ifneq ($(MXE_SYSTEM),msvc)
254 LD_LIBRARY_PATH := $(HOST_LIBDIR):$(HOST_LIB64DIR) 261 MXE_CPPFLAGS := '-I$(HOST_INCDIR)'
262 ifeq ($MXE_USE_LIB64_DIRECTORY)
263 MXE_LDFLAGS := '-L$(HOST_LIBDIR) -L$(HOST_LIB64DIR)'
264 LD_LIBRARY_PATH := $(HOST_LIBDIR):$(HOST_LIB64DIR)
265 else
266 MXE_LDFLAGS := '-L$(HOST_LIBDIR)'
267 LD_LIBRARY_PATH := $(HOST_LIBDIR)
268 endif
255 export LD_LIBRARY_PATH 269 export LD_LIBRARY_PATH
256 MXE_CPPFLAGS := '-I$(HOST_INCDIR)'
257 MXE_LDFLAGS := '-L$(HOST_LIBDIR)'
258 endif 270 endif
259 271
260 LN := ln 272 LN := ln
261 LN_S := $(LN) -s 273 LN_S := $(LN) -s
262 LN_SF := $(LN_S) -f 274 LN_SF := $(LN_S) -f