From 20c9b1d849dcc70f0cab29b84e0bb92cceed05fd Mon Sep 17 00:00:00 2001 From: Gergely Pilisi Date: Tue, 5 Jul 2016 12:46:49 +0200 Subject: [PATCH 1/2] Makefile changes to protect original compiler flags Signed-off-by: Gergely Pilisi --- Makefile.cfg | 8 ++++---- loggerplugins/JUnitLogger/Makefile | 9 +++++---- loggerplugins/JUnitLogger2/Makefile | 9 +++++---- loggerplugins/TSTLogger/Makefile | 9 +++++---- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/Makefile.cfg b/Makefile.cfg index de4fe1f9a..edbc42e44 100644 --- a/Makefile.cfg +++ b/Makefile.cfg @@ -103,7 +103,7 @@ XMLDIR := default # Flags for the C(++) preprocessor: # Prevent a warning about yyinput being defined but not used -CPPFLAGS := -DYY_NO_INPUT +CPPFLAGS += -DYY_NO_INPUT # Flags shared between C and C++ COMPILERFLAGS := -Wall @@ -114,10 +114,10 @@ COMPILERFLAGS := -Wall # Flags for the C compiler. # std=gnu9x shuts up warnings about long long and variadic macros -CCFLAGS = $(COMPILERFLAGS) -std=gnu9x +CCFLAGS += $(COMPILERFLAGS) -std=gnu9x # Flags for the C++ compiler: -CXXFLAGS = $(COMPILERFLAGS) -Wno-long-long +CXXFLAGS += $(COMPILERFLAGS) -Wno-long-long # The command for maintaining static libraries: AR := ar @@ -128,7 +128,7 @@ AR := ar LD = $(CXX) -shared # Flags for linking binary executables (e.g. for profiling): -LDFLAGS = $(MINGW) +LDFLAGS += $(MINGW) # The command for removing symbol table from the executables: STRIP := strip diff --git a/loggerplugins/JUnitLogger/Makefile b/loggerplugins/JUnitLogger/Makefile index 74599aaa8..e5f749580 100644 --- a/loggerplugins/JUnitLogger/Makefile +++ b/loggerplugins/JUnitLogger/Makefile @@ -39,10 +39,11 @@ CPPFLAGS_RT2 := $(CPPFLAGS) -I$(ABS_SRC)/../../core2 -DTITAN_RUNTIME_2 CXXFLAGS += -Werror -LDFLAGS += -g -L$(ABS_SRC)/../../core -Wl,-soname,$(SHARED_LIB).$(MAJOR) -o $(SHARED_LIB).$(MAJOR).$(MINOR) -LDFLAGS_RT2 += -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_RT2).$(MAJOR) -o $(SHARED_LIB_RT2).$(MAJOR).$(MINOR) -LDFLAGS_PARALLEL += -g -L$(ABS_SRC)/../../core -Wl,-soname,$(SHARED_LIB_PARALLEL).$(MAJOR) -o $(SHARED_LIB_PARALLEL).$(MAJOR).$(MINOR) -LDFLAGS_PARALLEL_RT2 += -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_PARALLEL_RT2).$(MAJOR) -o $(SHARED_LIB_PARALLEL_RT2).$(MAJOR).$(MINOR) +LDFLAGS_ORIG := $(LDFLAGS) +LDFLAGS += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core -Wl,-soname,$(SHARED_LIB).$(MAJOR) -o $(SHARED_LIB).$(MAJOR).$(MINOR) +LDFLAGS_RT2 += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_RT2).$(MAJOR) -o $(SHARED_LIB_RT2).$(MAJOR).$(MINOR) +LDFLAGS_PARALLEL += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core -Wl,-soname,$(SHARED_LIB_PARALLEL).$(MAJOR) -o $(SHARED_LIB_PARALLEL).$(MAJOR).$(MINOR) +LDFLAGS_PARALLEL_RT2 += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_PARALLEL_RT2).$(MAJOR) -o $(SHARED_LIB_PARALLEL_RT2).$(MAJOR).$(MINOR) LIBS := -lttcn3-dynamic LIBS_RT2 := -lttcn3-rt2-dynamic diff --git a/loggerplugins/JUnitLogger2/Makefile b/loggerplugins/JUnitLogger2/Makefile index 16efc69d6..adb083a73 100644 --- a/loggerplugins/JUnitLogger2/Makefile +++ b/loggerplugins/JUnitLogger2/Makefile @@ -39,10 +39,11 @@ CPPFLAGS_RT2 := $(CPPFLAGS) -I$(ABS_SRC)/../../core2 -DTITAN_RUNTIME_2 CXXFLAGS += -Werror -LDFLAGS += -g -L$(ABS_SRC)/../../core -Wl,-soname,$(SHARED_LIB).$(MAJOR) -o $(SHARED_LIB).$(MAJOR).$(MINOR) -LDFLAGS_RT2 += -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_RT2).$(MAJOR) -o $(SHARED_LIB_RT2).$(MAJOR).$(MINOR) -LDFLAGS_PARALLEL += -g -L$(ABS_SRC)/../../core -Wl,-soname,$(SHARED_LIB_PARALLEL).$(MAJOR) -o $(SHARED_LIB_PARALLEL).$(MAJOR).$(MINOR) -LDFLAGS_PARALLEL_RT2 += -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_PARALLEL_RT2).$(MAJOR) -o $(SHARED_LIB_PARALLEL_RT2).$(MAJOR).$(MINOR) +LDFLAGS_ORIG := $(LDFLAGS) +LDFLAGS += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core -Wl,-soname,$(SHARED_LIB).$(MAJOR) -o $(SHARED_LIB).$(MAJOR).$(MINOR) +LDFLAGS_RT2 += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_RT2).$(MAJOR) -o $(SHARED_LIB_RT2).$(MAJOR).$(MINOR) +LDFLAGS_PARALLEL += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core -Wl,-soname,$(SHARED_LIB_PARALLEL).$(MAJOR) -o $(SHARED_LIB_PARALLEL).$(MAJOR).$(MINOR) +LDFLAGS_PARALLEL_RT2 += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_PARALLEL_RT2).$(MAJOR) -o $(SHARED_LIB_PARALLEL_RT2).$(MAJOR).$(MINOR) LIBS := -lttcn3-dynamic LIBS_RT2 := -lttcn3-rt2-dynamic diff --git a/loggerplugins/TSTLogger/Makefile b/loggerplugins/TSTLogger/Makefile index e086bb055..8c46ce63c 100644 --- a/loggerplugins/TSTLogger/Makefile +++ b/loggerplugins/TSTLogger/Makefile @@ -39,10 +39,11 @@ CPPFLAGS_RT2 := $(CPPFLAGS) -I$(ABS_SRC)/../../core2 -DTITAN_RUNTIME_2 CXXFLAGS += -Werror -LDFLAGS += -g -L$(ABS_SRC)/../../core -Wl,-soname,$(SHARED_LIB).$(MAJOR) -o $(SHARED_LIB).$(MAJOR).$(MINOR) -LDFLAGS_RT2 += -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_RT2).$(MAJOR) -o $(SHARED_LIB_RT2).$(MAJOR).$(MINOR) -LDFLAGS_PARALLEL += -g -L$(ABS_SRC)/../../core -Wl,-soname,$(SHARED_LIB_PARALLEL).$(MAJOR) -o $(SHARED_LIB_PARALLEL).$(MAJOR).$(MINOR) -LDFLAGS_PARALLEL_RT2 += -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_PARALLEL_RT2).$(MAJOR) -o $(SHARED_LIB_PARALLEL_RT2).$(MAJOR).$(MINOR) +LDFLAGS_ORIG := $(LDFLAGS) +LDFLAGS += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core -Wl,-soname,$(SHARED_LIB).$(MAJOR) -o $(SHARED_LIB).$(MAJOR).$(MINOR) +LDFLAGS_RT2 += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_RT2).$(MAJOR) -o $(SHARED_LIB_RT2).$(MAJOR).$(MINOR) +LDFLAGS_PARALLEL += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core -Wl,-soname,$(SHARED_LIB_PARALLEL).$(MAJOR) -o $(SHARED_LIB_PARALLEL).$(MAJOR).$(MINOR) +LDFLAGS_PARALLEL_RT2 += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_PARALLEL_RT2).$(MAJOR) -o $(SHARED_LIB_PARALLEL_RT2).$(MAJOR).$(MINOR) LIBS := -lttcn3-dynamic LIBS_RT2 := -lttcn3-rt2-dynamic -- GitLab From d6945b589549fdb76e286e562e5595a905632f92 Mon Sep 17 00:00:00 2001 From: Gergely Pilisi Date: Tue, 5 Jul 2016 13:35:50 +0200 Subject: [PATCH 2/2] Removed unnecessary LDFLAG options Signed-off-by: Gergely Pilisi --- loggerplugins/JUnitLogger/Makefile | 2 +- loggerplugins/JUnitLogger2/Makefile | 2 +- loggerplugins/TSTLogger/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/loggerplugins/JUnitLogger/Makefile b/loggerplugins/JUnitLogger/Makefile index e5f749580..995c86a54 100644 --- a/loggerplugins/JUnitLogger/Makefile +++ b/loggerplugins/JUnitLogger/Makefile @@ -40,7 +40,7 @@ CPPFLAGS_RT2 := $(CPPFLAGS) -I$(ABS_SRC)/../../core2 -DTITAN_RUNTIME_2 CXXFLAGS += -Werror LDFLAGS_ORIG := $(LDFLAGS) -LDFLAGS += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core -Wl,-soname,$(SHARED_LIB).$(MAJOR) -o $(SHARED_LIB).$(MAJOR).$(MINOR) +LDFLAGS += -g -L$(ABS_SRC)/../../core -Wl,-soname,$(SHARED_LIB).$(MAJOR) -o $(SHARED_LIB).$(MAJOR).$(MINOR) LDFLAGS_RT2 += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_RT2).$(MAJOR) -o $(SHARED_LIB_RT2).$(MAJOR).$(MINOR) LDFLAGS_PARALLEL += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core -Wl,-soname,$(SHARED_LIB_PARALLEL).$(MAJOR) -o $(SHARED_LIB_PARALLEL).$(MAJOR).$(MINOR) LDFLAGS_PARALLEL_RT2 += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_PARALLEL_RT2).$(MAJOR) -o $(SHARED_LIB_PARALLEL_RT2).$(MAJOR).$(MINOR) diff --git a/loggerplugins/JUnitLogger2/Makefile b/loggerplugins/JUnitLogger2/Makefile index adb083a73..c6e83efe3 100644 --- a/loggerplugins/JUnitLogger2/Makefile +++ b/loggerplugins/JUnitLogger2/Makefile @@ -40,7 +40,7 @@ CPPFLAGS_RT2 := $(CPPFLAGS) -I$(ABS_SRC)/../../core2 -DTITAN_RUNTIME_2 CXXFLAGS += -Werror LDFLAGS_ORIG := $(LDFLAGS) -LDFLAGS += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core -Wl,-soname,$(SHARED_LIB).$(MAJOR) -o $(SHARED_LIB).$(MAJOR).$(MINOR) +LDFLAGS += -g -L$(ABS_SRC)/../../core -Wl,-soname,$(SHARED_LIB).$(MAJOR) -o $(SHARED_LIB).$(MAJOR).$(MINOR) LDFLAGS_RT2 += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_RT2).$(MAJOR) -o $(SHARED_LIB_RT2).$(MAJOR).$(MINOR) LDFLAGS_PARALLEL += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core -Wl,-soname,$(SHARED_LIB_PARALLEL).$(MAJOR) -o $(SHARED_LIB_PARALLEL).$(MAJOR).$(MINOR) LDFLAGS_PARALLEL_RT2 += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_PARALLEL_RT2).$(MAJOR) -o $(SHARED_LIB_PARALLEL_RT2).$(MAJOR).$(MINOR) diff --git a/loggerplugins/TSTLogger/Makefile b/loggerplugins/TSTLogger/Makefile index 8c46ce63c..3481c597f 100644 --- a/loggerplugins/TSTLogger/Makefile +++ b/loggerplugins/TSTLogger/Makefile @@ -40,7 +40,7 @@ CPPFLAGS_RT2 := $(CPPFLAGS) -I$(ABS_SRC)/../../core2 -DTITAN_RUNTIME_2 CXXFLAGS += -Werror LDFLAGS_ORIG := $(LDFLAGS) -LDFLAGS += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core -Wl,-soname,$(SHARED_LIB).$(MAJOR) -o $(SHARED_LIB).$(MAJOR).$(MINOR) +LDFLAGS += -g -L$(ABS_SRC)/../../core -Wl,-soname,$(SHARED_LIB).$(MAJOR) -o $(SHARED_LIB).$(MAJOR).$(MINOR) LDFLAGS_RT2 += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_RT2).$(MAJOR) -o $(SHARED_LIB_RT2).$(MAJOR).$(MINOR) LDFLAGS_PARALLEL += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core -Wl,-soname,$(SHARED_LIB_PARALLEL).$(MAJOR) -o $(SHARED_LIB_PARALLEL).$(MAJOR).$(MINOR) LDFLAGS_PARALLEL_RT2 += $(LDFLAGS_ORIG) -g -L$(ABS_SRC)/../../core2 -Wl,-soname,$(SHARED_LIB_PARALLEL_RT2).$(MAJOR) -o $(SHARED_LIB_PARALLEL_RT2).$(MAJOR).$(MINOR) -- GitLab