Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-02 17:09:26 +02:00
Code Issues Releases Wiki Activity

fix linking on linux

Browse Source 
This was only working because g++ can be used to link C++ and
Objective-C object files. As soon as CXX is set to a different compiler
this failed on linux, trying to link objects compiled with a different
compiler.
This commit is contained in:
Thomas Fehér 2016-02-12 20:59:15 +01:00 committed by Paul Licameli
parent 01a95c50ba
commit be15ddee88
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib-src/FileDialog/Makefile.in
View File

@ -216,6 +216,10 @@ OBJCXXLINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(OBJCXXLD) $(AM_OBJCXXFLAGS) $(OBJCXXFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_OBJCXXLD = $(am__v_OBJCXXLD_@AM_V@)
# Overwrite C++ variables with values for Objective-C, because in the end there
# is only one linker command that should be configured correctly.
@MAC_TRUE@CXXLINK = $(OBJCXXLINK)
@MAC_TRUE@AM_V_CXXLD = $(AM_V_OBJCXXLD)
am__v_OBJCXXLD_ = $(am__v_OBJCXXLD_@AM_DEFAULT_V@)
am__v_OBJCXXLD_0 = @echo " OBJCXXLD" $@;
am__v_OBJCXXLD_1 =
@ -520,8 +524,8 @@ win/$(DEPDIR)/$(am__dirstamp):
win/libFileDialog_la-FileDialogPrivate.lo: win/$(am__dirstamp) \
win/$(DEPDIR)/$(am__dirstamp)
libFileDialog.la: $(libFileDialog_la_OBJECTS) $(libFileDialog_la_DEPENDENCIES) $(EXTRA_libFileDialog_la_DEPENDENCIES)
$(AM_V_OBJCXXLD)$(OBJCXXLINK) -rpath $(libdir) $(libFileDialog_la_OBJECTS) $(libFileDialog_la_LIBADD) $(LIBS)
libFileDialog.la: $(libFileDialog_la_OBJECTS) $(libFileDialog_la_DEPENDENCIES) $(EXTRA_libFileDialog_la_DEPENDENCIES)
$(AM_V_CXXLD)$(CXXLINK) -rpath $(libdir) $(libFileDialog_la_OBJECTS) $(libFileDialog_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)