X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fhost-build.mk;h=e2b5f2f8d1882207e11697df3df1302076adfaa3;hb=c584aed6b1441bb9261d6710aa64e4ccbaf9c39c;hp=320e74ee47d0b1fbd140867794df2c07301e9fd4;hpb=6d1884c583d7de97aecb6ea7c4cba9bf6de08e2a;p=openwrt%2Fopenwrt.git diff --git a/include/host-build.mk b/include/host-build.mk index 320e74ee47..e2b5f2f8d1 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -50,12 +50,17 @@ define Host/Prepare $(call Host/Prepare/Default) endef +ifeq ($(HOST_OS),Darwin) + HOST_CFLAGS += -I/usr/local/opt/openssl/include + HOST_LDFLAGS += -L/usr/local/opt/openssl/lib +endif + HOST_CONFIGURE_VARS = \ CC="$(HOSTCC)" \ CFLAGS="$(HOST_CFLAGS)" \ CPPFLAGS="$(HOST_CPPFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \ - SHELL="$(BASH)" + SHELL="$(SHELL)" HOST_CONFIGURE_ARGS = \ --target=$(GNU_HOST_NAME) \ @@ -71,13 +76,7 @@ HOST_CONFIGURE_ARGS = \ HOST_MAKE_FLAGS = -HOST_CONFIGURE_CMD = ./configure - -ifneq ($(HOST_OS),Darwin) - ifeq ($(CONFIG_BUILD_STATIC_TOOLS),y) - HOST_STATIC_LINKING = -static - endif -endif +HOST_CONFIGURE_CMD = $(BASH) ./configure define Host/Configure/Default $(if $(HOST_CONFIGURE_PARALLEL),+)(cd $(HOST_BUILD_DIR)/$(3); \ @@ -137,6 +136,7 @@ define Host/Exports/Default $(1) : export STAGING_PREFIX=$$(STAGING_DIR_HOST) $(1) : export PKG_CONFIG_PATH=$$(STAGING_DIR_HOST)/lib/pkgconfig $(1) : export PKG_CONFIG_LIBDIR=$$(STAGING_DIR_HOST)/lib/pkgconfig + $(1) : export CCACHE_DIR:=$(STAGING_DIR_HOST)/ccache endef Host/Exports=$(Host/Exports/Default) @@ -174,6 +174,7 @@ ifndef DUMP $(call Host/Install) $(foreach hook,$(Hooks/HostInstall/Post),$(call $(hook))$(sep)) mkdir -p $$(shell dirname $$@) + touch $(HOST_STAMP_BUILT) touch $$@ ifndef STAMP_BUILT