[packages/Firebird.git] / cloop-honour-build-flags.patch

Description: make cloop build honor compiler/linker flags from the environment
Author: Damyan Ivanov <dmn@debian.org>
Forwarded: no

--- a/extern/cloop/Makefile
+++ b/extern/cloop/Makefile
@@ -6,7 +6,7 @@ TARGET	:= release
 
 CC	:= gcc
 CXX	:= g++
-LD	:= $(CXX)
+LD	:= $(CXX) $(LDFLAGS)
 
 SRC_DIR		:= src
 BUILD_DIR	:= build
@@ -27,8 +27,9 @@ SRCS_CPP := $(foreach sdir,$(SRC_DIRS),$
 OBJS_C := $(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(SRCS_C))
 OBJS_CPP := $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRCS_CPP))
 
-C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter
-CXX_FLAGS := $(C_FLAGS)
+COMMON_C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter
+C_FLAGS := $(COMMON_C_FLAGS) $(CFLAGS) $(CPPFLAGS)
+CXX_FLAGS := $(COMMON_C_FLAGS) $(CXXFLAGS) $(CPPFLAGS)
 FPC_FLAGS := -Mdelphi
 
 ifeq ($(TARGET),release)
Commit	Line	Data
acde953e ER	1	Description: make cloop build honor compiler/linker flags from the environment
	2	Author: Damyan Ivanov <dmn@debian.org>
	3	Forwarded: no
	4
	5	--- a/extern/cloop/Makefile
	6	+++ b/extern/cloop/Makefile
	7	@@ -6,7 +6,7 @@ TARGET := release
	8
	9	CC := gcc
	10	CXX := g++
	11	-LD := $(CXX)
	12	+LD := $(CXX) $(LDFLAGS)
	13
	14	SRC_DIR := src
	15	BUILD_DIR := build
	16	@@ -27,8 +27,9 @@ SRCS_CPP := $(foreach sdir,$(SRC_DIRS),$
	17	OBJS_C := $(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(SRCS_C))
	18	OBJS_CPP := $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRCS_CPP))
	19
	20	-C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter
	21	-CXX_FLAGS := $(C_FLAGS)
	22	+COMMON_C_FLAGS := -ggdb -fPIC -MMD -MP -W -Wall -Wno-unused-parameter
	23	+C_FLAGS := $(COMMON_C_FLAGS) $(CFLAGS) $(CPPFLAGS)
	24	+CXX_FLAGS := $(COMMON_C_FLAGS) $(CXXFLAGS) $(CPPFLAGS)
	25	FPC_FLAGS := -Mdelphi
	26
	27	ifeq ($(TARGET),release)