external/Makefile: Change variable HOST to MAKE_HOST
Proposed fix for issue #1231 - FreeBSD (tcsh) build problem due to HOST environment variable. The variable is used for cross-compilation. The process may be improved even further in the future. So far this hot fix.
This commit is contained in:
committed by
Rusty Russell
parent
0087105d6c
commit
b28d71a9a5
6
external/Makefile
vendored
6
external/Makefile
vendored
@@ -32,7 +32,7 @@ external/libsodium.a: external/libsodium/src/libsodium/libsodium.la
|
||||
external/libsodium/src/libsodium/include/sodium.h: submodcheck-libsodium
|
||||
|
||||
external/libsodium/src/libsodium/libsodium.la: external/libsodium/src/libsodium/include/sodium.h
|
||||
cd external/libsodium && ./autogen.sh && ./configure CC="$(CC)" --enable-static=yes --host="$(HOST)" --build="$(BUILD)" --enable-shared=no --enable-tests=no --prefix=/ --libdir=/ && $(MAKE)
|
||||
cd external/libsodium && ./autogen.sh && ./configure CC="$(CC)" --enable-static=yes --host="$(MAKE_HOST)" --build="$(BUILD)" --enable-shared=no --enable-tests=no --prefix=/ --libdir=/ && $(MAKE)
|
||||
|
||||
$(LIBWALLY_HEADERS) $(LIBSECP_HEADERS): submodcheck-libwally-core
|
||||
|
||||
@@ -42,7 +42,7 @@ external/libsecp256k1.% external/libwallycore.%: external/libwally-core/src/secp
|
||||
$(MAKE) -C external/libwally-core DESTDIR=$$(pwd)/external install-exec
|
||||
|
||||
external/libwally-core/src/libwallycore.% external/libwally-core/src/secp256k1/libsecp256k1.%: $(LIBWALLY_HEADERS) $(LIBSECP_HEADERS)
|
||||
cd external/libwally-core && ./tools/autogen.sh && ./configure CC="$(CC)" --enable-static=yes --host="$(HOST)" --build="$(BUILD)" --enable-module-recovery --enable-shared=no --prefix=/ --libdir=/ && $(MAKE)
|
||||
cd external/libwally-core && ./tools/autogen.sh && ./configure CC="$(CC)" --enable-static=yes --host="$(MAKE_HOST)" --build="$(BUILD)" --enable-module-recovery --enable-shared=no --prefix=/ --libdir=/ && $(MAKE)
|
||||
|
||||
external/jsmn/jsmn.h: submodcheck-jsmn
|
||||
|
||||
@@ -75,7 +75,7 @@ external/libbacktrace/backtrace.h: submodcheck-libbacktrace
|
||||
# Need separate build dir: changes inside submodule make git think it's dirty.
|
||||
external/libbacktrace.a: external/libbacktrace/backtrace.h
|
||||
@mkdir external/libbacktrace-build 2>/dev/null || true
|
||||
cd external/libbacktrace-build && ../libbacktrace/configure CC="$(CC)" --enable-static=yes --host="$(HOST)" --build="$(BUILD)" --enable-shared=no --prefix=/ --libdir=/ && $(MAKE)
|
||||
cd external/libbacktrace-build && ../libbacktrace/configure CC="$(CC)" --enable-static=yes --host="$(MAKE_HOST)" --build="$(BUILD)" --enable-shared=no --prefix=/ --libdir=/ && $(MAKE)
|
||||
$(MAKE) -C external/libbacktrace-build DESTDIR=$$(pwd)/external install-exec
|
||||
|
||||
distclean: external-distclean
|
||||
|
||||
Reference in New Issue
Block a user