Pick up CC for OpenSSL and ensure version logged for OpenSSL and HAProxy in build

This commit is contained in:
Tristan
2022-08-03 10:05:20 +01:00
parent 6ddf51d2b1
commit 79e2f46444
3 changed files with 5 additions and 2 deletions

View File

@@ -92,10 +92,12 @@ test: $(HAPROXY_BUILDIR)
VTEST_PROGRAM="$(DEP_DIST_ROOT_VTEST)/vtest" \
$(MAKE) -C "$(HAPROXY_BUILDIR)" -j "$(shell nproc)" REGTESTS_TYPES=default,bug,devel reg-tests
.PHONY: $(HAPROXY_DESTDIR)
$(HAPROXY_DESTDIR):
@if [ -d "$(HAPROXY_DESTDIR)" ]; then rm -rf $(HAPROXY_DESTDIR); fi
@mkdir -pv "$(HAPROXY_DESTDIR)"
$(MAKE) -C "$(HAPROXY_BUILDIR)" -j "$(shell nproc)" DESTDIR="$(HAPROXY_DESTDIR_ABS)" install
$(HAPROXY_DESTDIR_ABS)/usr/local/sbin/haproxy -vv
$(HAPROXY_ARCHIVE): $(HAPROXY_DESTDIR)
tar -C "$(HAPROXY_DESTDIR)" -cjf "$(HAPROXY_ARCHIVE)" "usr"