From 939471b9ebdc549b453e23612627fe6bc9afde1d Mon Sep 17 00:00:00 2001 From: "Alan T. DeKok" Date: Tue, 22 Sep 2015 11:24:12 -0400 Subject: [PATCH] Linker changes for building eapol_test on OS X Signed-off-by: Alan DeKok --- src/drivers/drivers.mak | 4 +++- wpa_supplicant/Makefile | 3 +++ wpa_supplicant/defconfig | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/drivers/drivers.mak b/src/drivers/drivers.mak index 9434078..3dd43c7 100644 --- a/src/drivers/drivers.mak +++ b/src/drivers/drivers.mak @@ -54,7 +54,9 @@ else ifdef CONFIG_LIBNL_TINY DRV_LIBS += -lnl-tiny else - DRV_LIBS += -lnl + ifndef CONFIG_OSX + DRV_LIBS += -lnl + endif endif ifdef CONFIG_LIBNL20 diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile index 1597412..de3c87f 100644 --- a/wpa_supplicant/Makefile +++ b/wpa_supplicant/Makefile @@ -131,12 +131,15 @@ endif OBJS += ../src/utils/$(CONFIG_ELOOP).o OBJS_c += ../src/utils/$(CONFIG_ELOOP).o +ifndef CONFIG_OSX ifeq ($(CONFIG_ELOOP), eloop) # Using glibc < 2.17 requires -lrt for clock_gettime() +# OS X has an alternate implementation LIBS += -lrt LIBS_c += -lrt LIBS_p += -lrt endif +endif ifdef CONFIG_ELOOP_POLL CFLAGS += -DCONFIG_ELOOP_POLL diff --git a/wpa_supplicant/defconfig b/wpa_supplicant/defconfig index d714a69..01a8c2c 100644 --- a/wpa_supplicant/defconfig +++ b/wpa_supplicant/defconfig @@ -501,3 +501,6 @@ CONFIG_PEERKEY=y # Enable CLI commands for FST testing #CONFIG_FST_TEST=y + +# OS X builds. This is only for building eapol_test. +#CONFIG_OSX=y -- 2.1.4