You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
28 lines
838 B
28 lines
838 B
5 years ago
|
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)
|