Mercurial > octave

comparison src/module.mk @ 30368:15ae4d97a632 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mkoctfile: Correctly handle relocation in cross-compiler. * configure.ac: Add new makefile variable AMCOND_RELOCATE_ALL. * src/module.mk (mkoctfile CROSS): Optionally, set OCTAVE_REPLACE_PREFIX. * src/mkoctfile.in.cc (replace_prefix): Simplify code. Style fix.
author Markus Mützel <markus.muetzel@gmx.de>
date Fri, 26 Nov 2021 22:08:49 +0100
parents b6f80b1d448f
children
comparison
equal deleted inserted replaced
30366:aedfb5b870ad 30368:15ae4d97a632
174 174
175 ## Building cross mkoctfile. 175 ## Building cross mkoctfile.
176 176
177 OCTAVE_CROSS_TOOLS += %reldir%/$(host_triplet)-mkoctfile$(BUILD_EXEEXT) 177 OCTAVE_CROSS_TOOLS += %reldir%/$(host_triplet)-mkoctfile$(BUILD_EXEEXT)
178 178
179 if AMCOND_RELOCATE_ALL
180 OCTAVE_REPLACE_PREFIX_CPPFLAGS = -DOCTAVE_REPLACE_PREFIX
181 endif
182
179 %reldir%/$(host_triplet)-mkoctfile$(BUILD_EXEEXT): %reldir%/$(host_triplet)-mkoctfile.cc 183 %reldir%/$(host_triplet)-mkoctfile$(BUILD_EXEEXT): %reldir%/$(host_triplet)-mkoctfile.cc
180 $(BUILD_CXX) -o %reldir%/$(host_triplet)-mkoctfile$(BUILD_EXEEXT) -DCROSS=1 $(DEFAULT_INCLUDES) $(BUILD_CXXFLAGS) $(BUILD_LDFLAGS) -I$(srcdir)/src %reldir%/$(host_triplet)-mkoctfile.cc 184 $(BUILD_CXX) -o %reldir%/$(host_triplet)-mkoctfile$(BUILD_EXEEXT) $(OCTAVE_REPLACE_PREFIX_CPPFLAGS) -DCROSS=1 $(DEFAULT_INCLUDES) $(BUILD_CXXFLAGS) $(BUILD_LDFLAGS) -I$(srcdir)/src %reldir%/$(host_triplet)-mkoctfile.cc
181 185
182 %reldir%/$(host_triplet)-mkoctfile.cc: %reldir%/mkoctfile.in.cc build-aux/subst-cross-config-vals.sh | %reldir%/$(octave_dirstamp) 186 %reldir%/$(host_triplet)-mkoctfile.cc: %reldir%/mkoctfile.in.cc build-aux/subst-cross-config-vals.sh | %reldir%/$(octave_dirstamp)
183 $(AM_V_GEN)$(call simple-filter-rule,build-aux/subst-cross-config-vals.sh) 187 $(AM_V_GEN)$(call simple-filter-rule,build-aux/subst-cross-config-vals.sh)
184 188
185 ## Building cross octave-config. 189 ## Building cross octave-config.