RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-07 01:31:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR/BUILD: fix Lua build on Mac OS X

Browse Source 
Change gcc option syntax for Mac. -Wl,--export-dynamic is not
supported, use -Wl,-export_dynamic.

Thanks to Kirill A. Korinsky for the report.

This patch should be backported on each version from 1.6
This commit is contained in:
Thierry Fournier 2018-02-26 09:25:56 +01:00 committed by Willy Tarreau
parent 44e973f508
commit 13113d6abb
1 changed files with 2 additions and 1 deletions

3
Makefile
View File

@ -331,6 +331,7 @@ ifeq ($(TARGET),osx)
USE_POLL = implicit USE_POLL = implicit
USE_KQUEUE = implicit USE_KQUEUE = implicit
USE_TPROXY = implicit USE_TPROXY = implicit
EXPORT_SYMBOL = -export-dynamic
else else
ifeq ($(TARGET),openbsd) ifeq ($(TARGET),openbsd)
# This is for OpenBSD >= 5.7 # This is for OpenBSD >= 5.7
@ -630,7 +631,7 @@ check_lua_inc = $(shell if [ -d $(2)$(1) ]; then echo $(2)$(1); fi;)
BUILD_OPTIONS += $(call ignore_implicit,USE_LUA) BUILD_OPTIONS += $(call ignore_implicit,USE_LUA)
OPTIONS_CFLAGS += -DUSE_LUA $(if $(LUA_INC),-I$(LUA_INC)) OPTIONS_CFLAGS += -DUSE_LUA $(if $(LUA_INC),-I$(LUA_INC))
LUA_LD_FLAGS := -Wl,--export-dynamic $(if $(LUA_LIB),-L$(LUA_LIB)) LUA_LD_FLAGS := -Wl,$(if $(EXPORT_SYMBOL),$(EXPORT_SYMBOL),--export-dynamic) $(if $(LUA_LIB),-L$(LUA_LIB))
ifeq ($(LUA_LIB_NAME),) ifeq ($(LUA_LIB_NAME),)
# Try to automatically detect the Lua library # Try to automatically detect the Lua library
LUA_LIB_NAME := $(firstword $(foreach lib,lua5.3 lua53 lua,$(call check_lua_lib,$(lib),$(LUA_LD_FLAGS)))) LUA_LIB_NAME := $(firstword $(foreach lib,lua5.3 lua53 lua,$(call check_lua_lib,$(lib),$(LUA_LD_FLAGS))))