nico/NickelMenu-custom
1
0
Fork 0
Code Releases 1 Activity

Include CXXFLAGS during linking, add CPPFLAGS (#5)

Browse Source 
Honor CXXFLAGS when linking. This is necessary when using LTO with such
and ancient GCC version.
This commit is contained in:
NiLuJe
2020-05-03 17:42:23 +02:00
committed by GitHub
parent ae26344e6f
commit abc345d916
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -93,14 +93,14 @@ define rpatw =
endef endef
$(LIBRARIES): src/%.so: $(LIBRARIES): src/%.so:
$(CXX) -shared -o $@ $^ $(LDFLAGS) $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -o $@ $^ $(LDFLAGS)
$(MOCS): %.moc: %.h $(MOCS): %.moc: %.h
$(MOC) $< -o $@ $(MOC) $< -o $@
$(patsubst %.moc,%.o,$(MOCS)): %.o: %.moc $(patsubst %.moc,%.o,$(MOCS)): %.o: %.moc
$(CXX) -xc++ $(CXXFLAGS) -c $< -o $@ $(CXX) -xc++ $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
$(call rpatw,.c,.o): %.o: %.c $(call rpatw,.c,.o): %.o: %.c
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
$(call rpatw,.cc,.o): %.o: %.cc $(call rpatw,.cc,.o): %.o: %.cc
$(CXX) $(CXXFLAGS) -c $< -o $@ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
override GENERATED += $(LIBRARIES) $(MOCS) $(patsubst %.moc,%.o,$(MOCS)) $(call rpatw,.c,.o) $(call rpatw,.cc,.o) override GENERATED += $(LIBRARIES) $(MOCS) $(patsubst %.moc,%.o,$(MOCS)) $(call rpatw,.c,.o) $(call rpatw,.cc,.o)