diff options
| author | nyamatongwe <unknown> | 2012-01-20 15:09:45 +1100 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2012-01-20 15:09:45 +1100 |
| commit | da3082f8138af088adf8190b9255b9ea27c0e914 (patch) | |
| tree | 495801dc2a64ded0e3b28a238330597430fa358b | |
| parent | ea1cff070bc2a30a0600dafc8729695e272e5c57 (diff) | |
| download | scintilla-mirror-da3082f8138af088adf8190b9255b9ea27c0e914.tar.gz | |
Include CXXFLAGS from environment for bug #3476149.
| -rw-r--r-- | gtk/makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk/makefile b/gtk/makefile index e5faa6fd9..4483205c1 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -55,18 +55,18 @@ THREADFLAGS= endif ifdef DEBUG -CXXFLAGS=-DDEBUG -g $(CXXBASEFLAGS) $(THREADFLAGS) +CXXTFLAGS=-DDEBUG -g $(CXXFLAGS) $(CXXBASEFLAGS) $(THREADFLAGS) else -CXXFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS) +CXXTFLAGS=-DNDEBUG -Os $(CXXFLAGS) $(CXXBASEFLAGS) $(THREADFLAGS) endif -CFLAGS:=$(CXXFLAGS) +CFLAGS:=$(CXXTFLAGS) CONFIGFLAGS:=$(shell pkg-config --cflags $(GTKVERSION)) MARSHALLER=scintilla-marshal.o .cxx.o: - $(CC) $(CONFIGFLAGS) $(CXXFLAGS) -c $< + $(CC) $(CONFIGFLAGS) $(CXXTFLAGS) -c $< .c.o: $(CCOMP) $(CONFIGFLAGS) $(CFLAGS) -w -c $< @@ -78,7 +78,7 @@ clean: $(DEL) *.o $(COMPLIB) deps: - $(CC) -MM $(CONFIGFLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak + $(CC) -MM $(CONFIGFLAGS) $(CXXTFLAGS) *.cxx ../src/*.cxx | sed -e 's/\/usr.* //' | grep [a-zA-Z] >deps.mak $(COMPLIB): Accessor.o CharacterSet.o LexerBase.o LexerModule.o LexerSimple.o StyleContext.o WordList.o \ CharClassify.o Decoration.o Document.o PerLine.o Catalogue.o CallTip.o \ |