Mercurial > mxe-octave
diff src/boost.mk @ 3012:100e618349f7
Improve handling of prefix directories by defining HOST_PREFIX and
BUILD_TOOLS_PREFIX variables in top-level Makefile.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sun, 02 Jun 2013 10:31:04 -0400 |
| parents | 3e0cb61c076d |
| children | b6c7244a2f66 |
line wrap: on
line diff
--- a/src/boost.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/boost.mk Sun Jun 02 10:31:04 2013 -0400 @@ -20,7 +20,7 @@ # context switched library introduced in boost 1.51.0 does not build rm -r '$(1)/libs/context' # old version appears to interfere - rm -rf '$(PREFIX)/$(TARGET)/include/boost/' + rm -rf '$(HOST_PREFIX)/include/boost/' echo 'using gcc : : $(TARGET)-g++ : <rc>$(TARGET)-windres <archiver>$(TARGET)-ar ;' > '$(1)/user-config.jam' # compile boost jam cd '$(1)/tools/build/v2/engine' && ./build.sh @@ -35,17 +35,17 @@ --layout=tagged \ --without-mpi \ --without-python \ - --prefix='$(PREFIX)/$(TARGET)' \ - --exec-prefix='$(PREFIX)/$(TARGET)/bin' \ - --libdir='$(PREFIX)/$(TARGET)/lib' \ - --includedir='$(PREFIX)/$(TARGET)/include' \ - -sEXPAT_INCLUDE='$(PREFIX)/$(TARGET)/include' \ - -sEXPAT_LIBPATH='$(PREFIX)/$(TARGET)/lib' \ + --prefix='$(HOST_PREFIX)' \ + --exec-prefix='$(HOST_PREFIX)/bin' \ + --libdir='$(HOST_PREFIX)/lib' \ + --includedir='$(HOST_PREFIX)/include' \ + -sEXPAT_INCLUDE='$(HOST_PREFIX)/include' \ + -sEXPAT_LIBPATH='$(HOST_PREFIX)/lib' \ stage install '$(TARGET)-g++' \ -W -Wall -Werror -ansi -U__STRICT_ANSI__ -pedantic \ - '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-boost.exe' \ + '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-boost.exe' \ -DBOOST_THREAD_USE_LIB \ -lboost_serialization-mt \ -lboost_thread_win32-mt \