diff options
| author | Colin Snover | 2017-10-20 11:47:43 -0500 |
|---|---|---|
| committer | Bastien Bouclet | 2018-08-04 07:55:23 +0200 |
| commit | 72791aaa23d5c947cb44ab1bb64a0b9295443282 (patch) | |
| tree | 69b79e8748f8609098c6240cd93768b2b2e20d69 /Makefile | |
| parent | ad3feae490f8ed8ac74e8c6597963807bf9e278e (diff) | |
| download | scummvm-rg350-72791aaa23d5c947cb44ab1bb64a0b9295443282.tar.gz scummvm-rg350-72791aaa23d5c947cb44ab1bb64a0b9295443282.tar.bz2 scummvm-rg350-72791aaa23d5c947cb44ab1bb64a0b9295443282.zip | |
BUILD: Respect all build tool overrides from environment
Previously, only CXX could be overridden by the environment, which
made it impossible to correctly set tools for cross-compiler
toolchains which were not compatible with the default system tools.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -88,10 +88,12 @@ config.h: $(srcdir)/configure $(ENGINE_SUBDIRS_CONFIGURE) ifeq "$(findstring config.mk,$(MAKEFILE_LIST))" "config.mk" @echo "Running $(srcdir)/configure with the last specified parameters" @sleep 2 - LDFLAGS="$(SAVED_LDFLAGS)" CXX="$(SAVED_CXX)" \ - CXXFLAGS="$(SAVED_CXXFLAGS)" CPPFLAGS="$(SAVED_CPPFLAGS)" \ - ASFLAGS="$(SAVED_ASFLAGS)" WINDRESFLAGS="$(SAVED_WINDRESFLAGS)" \ - SDL_CONFIG="$(SAVED_SDL_CONFIG)" \ + AR="$(SAVED_AR)" AS="$(SAVED_AS)" ASFLAGS="$(SAVED_ASFLAGS)" \ + CPPFLAGS="$(SAVED_CPPFLAGS)" CXX="$(SAVED_CXX)" \ + CXXFLAGS="$(SAVED_CXXFLAGS)" LD="$(SAVED_LD)" \ + LDFLAGS="$(SAVED_LDFLAGS)" RANLIB="$(SAVED_RANLIB)" \ + SDL_CONFIG="$(SAVED_SDL_CONFIG)" STRIP="$(SAVED_STRIP)" \ + WINDRES="$(SAVED_WINDRES)" WINDRESFLAGS="$(SAVED_WINDRESFLAGS)" \ $(srcdir)/configure $(SAVED_CONFIGFLAGS) else $(error You need to run $(srcdir)/configure before you can run make. Check $(srcdir)/configure --help for a list of parameters) |