Merge pull request #8417 from cotequeiroz/luasql-flags

luasql: fix variants LDFLAGS
This commit is contained in:
Rosen Penev 2019-04-01 11:34:32 -07:00 committed by GitHub
commit 6846ed8625
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -82,21 +82,19 @@ TARGET_CFLAGS += $(FPIC) -std=gnu99
TARGET_CPPFLAGS += -DLUA_USE_LINUX TARGET_CPPFLAGS += -DLUA_USE_LINUX
ifeq ($(BUILD_VARIANT),mysql) ifeq ($(BUILD_VARIANT),mysql)
TARGET_CPPFLAGS += -I$(STAGING_DIR)/usr/include/mysql MAKE_FLAGS += DRIVER_INCS_mysql='-I$(STAGING_DIR)/usr/include/mysql' \
TARGET_LDFLAGS += -L$(STAGING_DIR)/usr/lib/mysql -lmysqlclient -lz DRIVER_LIBS_mysql='$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/mysql -lmysqlclient -lz'
endif endif
ifeq ($(BUILD_VARIANT),postgres) ifeq ($(BUILD_VARIANT),postgres)
TARGET_LDFLAGS += -lpq MAKE_FLAGS += DRIVER_LIBS_postgres='$(TARGET_LDFLAGS) -lpq'
endif endif
ifeq ($(BUILD_VARIANT),sqlite3) ifeq ($(BUILD_VARIANT),sqlite3)
TARGET_LDFLAGS += -lsqlite3 -lpthread MAKE_FLAGS += DRIVER_LIBS_sqlite='$(TARGET_LDFLAGS) -lsqlite3 -lpthread'
endif endif
MAKE_FLAGS += \ MAKE_FLAGS += \
DRIVER_INCS="$(TARGET_CPPFLAGS)" \
DRIVER_LIBS="$(TARGET_LDFLAGS)" \
CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
$(BUILD_VARIANT) $(BUILD_VARIANT)