diff options
| author | Daniel Willmann <dwillmann@sysmocom.de> | 2019-02-13 17:58:25 +0100 |
|---|---|---|
| committer | Daniel Willmann <dwillmann@sysmocom.de> | 2019-02-13 18:08:29 +0100 |
| commit | 6d9c57343bb4b2e1bafc19c8aec84fef4094798c (patch) | |
| tree | 14b35f86d0cfee0ff86e6db1a438f4fbd62d84c4 | |
| parent | db7fb8da951941a019f1032c7f36edcee8e802bd (diff) | |
Fix compilation on eclipse-titan 6.5.1daniel/titan-6_5-fix
Newer eclipse-titan makefilegen already sets CPPFLAGS like this:
CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)/include$(TTCN3_SUBDIR)
where TTCN3_SUBDIR expands to '/titan' and TTCN3_DIR to '/usr'
If we add /titan after include we end up with
-I/usr/include/titan/titan/ which will cause the compile to fail due to
a missing TTCN3.hh include.
Change-Id: If9fef29ce243be112d3735f0236335197f8f140f
Related: OS#3179
Sponsored-by: On-Waves ehf.
| -rwxr-xr-x | regen-makefile.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/regen-makefile.sh b/regen-makefile.sh index 5a4dd4c..90bdc39 100755 --- a/regen-makefile.sh +++ b/regen-makefile.sh @@ -31,7 +31,7 @@ sed -i -e 's/LDFLAGS = /LDFLAGS = -L \/usr\/lib\/titan /' Makefile # The -DMAKEDEPEND_RUN is a workaround for Debian packaging issue, # see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=879816 for details -sed -i -e 's/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include/CPPFLAGS = -D$(PLATFORM) -DMAKEDEPEND_RUN -DUSE_SCTP -I$(TTCN3_DIR)\/include -I\/usr\/include\/titan/' Makefile +sed -i -e 's/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include/CPPFLAGS = -D$(PLATFORM) -DMAKEDEPEND_RUN -DUSE_SCTP -I$(TTCN3_DIR)\/include -I\/usr\/include/' Makefile #remove -Wall from CXXFLAGS: we're not interested in generic warnings for autogenerated code cluttering the logs sed -i -e 's/-Wall//' Makefile |