Mercurial > mxe-octave

comparison src/gcc.mk @ 3014:b6c7244a2f66

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use HOST_BINDIR, HOST_LIBDIR, and HOST_INCDIR instead of MXE_BINDIR, MXE_LIBDIR, and MXE_INCDIR. Attempt to use these variables consistently instead of using $(HOST_PREFIX)/bin, $(HOST_PREFIX)/lib, and $(HOST_PREFIX)/include
author John W. Eaton <jwe@octave.org>
date Sun, 02 Jun 2013 16:59:24 -0400
parents bcc26ffe9a0f
children 951da75fd09c
comparison
equal deleted inserted replaced
3013:bcc26ffe9a0f 3014:b6c7244a2f66
93 --disable-libgomp \ 93 --disable-libgomp \
94 --disable-libmudflap \ 94 --disable-libmudflap \
95 $(shell [ `uname -s` == Darwin ] && echo "LDFLAGS='-Wl,-no_pie'") 95 $(shell [ `uname -s` == Darwin ] && echo "LDFLAGS='-Wl,-no_pie'")
96 $(MAKE) -C '$(1).build' -j '$(JOBS)' 96 $(MAKE) -C '$(1).build' -j '$(JOBS)'
97 $(MAKE) -C '$(1).build' -j 1 install 97 $(MAKE) -C '$(1).build' -j 1 install
98 mkdir -p $(TOP_DIR)/cross-tools/$(MXE_BINDIR) 98 mkdir -p $(TOP_DIR)/cross-tools/$(HOST_BINDIR)
99 $(MAKE) -C '$(1).build' -j 1 DESTDIR=$(TOP_DIR)/cross-tools install 99 $(MAKE) -C '$(1).build' -j 1 DESTDIR=$(TOP_DIR)/cross-tools install
100 100
101 # create pkg-config script 101 # create pkg-config script
102 (echo '#!/bin/sh'; \ 102 (echo '#!/bin/sh'; \
103 echo 'PKG_CONFIG_PATH="$$PKG_CONFIG_PATH_$(subst -,_,$(TARGET))" PKG_CONFIG_LIBDIR='\''$(MXE_LIBDIR)/pkgconfig'\'' exec pkg-config $($(PKG)_STATIC_FLAG) "$$@"') \ 103 echo 'PKG_CONFIG_PATH="$$PKG_CONFIG_PATH_$(subst -,_,$(TARGET))" PKG_CONFIG_LIBDIR='\''$(HOST_LIBDIR)/pkgconfig'\'' exec pkg-config $($(PKG)_STATIC_FLAG) "$$@"') \
104 > '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' 104 > '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config'
105 chmod 0755 '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' 105 chmod 0755 '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config'
106 106
107 # create the CMake toolchain file 107 # create the CMake toolchain file
108 [ -d '$(dir $(CMAKE_TOOLCHAIN_FILE))' ] || mkdir -p '$(dir $(CMAKE_TOOLCHAIN_FILE))' 108 [ -d '$(dir $(CMAKE_TOOLCHAIN_FILE))' ] || mkdir -p '$(dir $(CMAKE_TOOLCHAIN_FILE))'