[PATCH v5 09/15] build: remove hostapd vs. wpa_s build checks

Johannes Berg johannes at sipsolutions.net
Wed Sep 9 18:03:56 EDT 2020


From: Johannes Berg <johannes.berg at intel.com>

These are no longer needed now. Note that this was never
actually sufficient since src/drivers/ isn't the only
thing shared, and thus a cross-build didn't work.

Signed-off-by: Johannes Berg <johannes.berg at intel.com>
---
 hostapd/Makefile        | 10 +---------
 wpa_supplicant/Makefile |  8 --------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/hostapd/Makefile b/hostapd/Makefile
index f07acdf24478..555e05f4a896 100644
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -1264,18 +1264,10 @@ $(DESTDIR)$(BINDIR)/%: %
 
 install: $(addprefix $(DESTDIR)$(BINDIR)/,$(ALL))
 
-../src/drivers/build.hostapd:
-	@if [ -f ../src/drivers/build.wpa_supplicant ]; then \
-		$(MAKE) -C ../src/drivers clean; \
-	fi
-	@touch ../src/drivers/build.hostapd
-
-BCHECK=../src/drivers/build.hostapd
-
 _OBJS_VAR := OBJS
 include ../src/objs.mk
 
-hostapd: $(BCHECK) $(OBJS)
+hostapd: $(OBJS)
 	$(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
 	@$(E) "  LD " $@
 
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index c858f43b5909..9adadf141e67 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -1852,14 +1852,6 @@ endif
 
 dynamic_eap_methods: $(EAPDYN)
 
-../src/drivers/build.wpa_supplicant:
-	@if [ -f ../src/drivers/build.hostapd ]; then \
-		$(MAKE) -C ../src/drivers clean; \
-	fi
-	@touch ../src/drivers/build.wpa_supplicant
-
-BCHECK=../src/drivers/build.wpa_supplicant
-
 _OBJS_VAR := OBJS_priv
 include ../src/objs.mk
 wpa_priv: $(BCHECK) $(OBJS_priv)
-- 
2.26.2




More information about the Hostap mailing list