Mercurial > mxe-octave

comparison Makefile @ 3031:951da75fd09c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improve handling of cross tool prefix
author John W. Eaton <jwe@octave.org>
date Sun, 09 Jun 2013 09:48:08 -0400
parents 2849bea3711f
children 1427f8d3a0af
comparison
equal deleted inserted replaced
3030:0d67b4c363cd 3031:951da75fd09c
121 121
122 CONFIGURE_CPPFLAGS := CPPFLAGS='-I$(HOST_PREFIX)/include' 122 CONFIGURE_CPPFLAGS := CPPFLAGS='-I$(HOST_PREFIX)/include'
123 CONFIGURE_LDFLAGS := LDFLAGS='-L$(HOST_PREFIX)/lib' 123 CONFIGURE_LDFLAGS := LDFLAGS='-L$(HOST_PREFIX)/lib'
124 124
125 ifeq ($(MXE_NATIVE_BUILD),yes) 125 ifeq ($(MXE_NATIVE_BUILD),yes)
126 MXE_TOOL_PREFIX :=
126 MXE_AR := ar 127 MXE_AR := ar
127 MXE_RANLIB := ranlib 128 MXE_RANLIB := ranlib
128 MXE_CC := gcc 129 MXE_CC := gcc
129 MXE_CXX := g++ 130 MXE_CXX := g++
130 MXE_F77 := gfortran 131 MXE_F77 := gfortran
132 MXE_DLLTOOL := dlltool
133 MXE_NM := nm
134 MXE_STRIP := strip
131 ifeq ($(MXE_SYSTEM),mingw) 135 ifeq ($(MXE_SYSTEM),mingw)
132 MXE_WINDRES := windres 136 MXE_WINDRES := windres
133 else 137 else
134 MXE_WINDRES := true 138 MXE_WINDRES := true
135 endif 139 endif
136 MXE_PKG_CONFIG := pkg-config 140 MXE_PKG_CONFIG := pkg-config
137 MXE_QMAKE := qmake 141 MXE_QMAKE := qmake
138 else 142 else
139 MXE_AR := '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-ar' 143 MXE_TOOL_PREFIX := $(TARGET)-
140 MXE_RANLIB := '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-ranlib' 144 MXE_AR := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)ar'
141 MXE_CC := '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-gcc' 145 MXE_RANLIB := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)ranlib'
142 MXE_CXX := '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-g++' 146 MXE_CC := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)gcc'
143 MXE_F77 := '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-gfortran' 147 MXE_CXX := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)g++'
148 MXE_F77 := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)gfortran'
149 MXE_DLLTOOL := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)dlltool'
150 MXE_NM := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)nm'
151 MXE_STRIP := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)strip'
144 ifeq ($(MXE_SYSTEM),mingw) 152 ifeq ($(MXE_SYSTEM),mingw)
145 MXE_WINDRES := '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-windres' 153 MXE_WINDRES := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)windres'
146 else 154 else
147 MXE_WINDRES := true 155 MXE_WINDRES := true
148 endif 156 endif
149 MXE_PKG_CONFIG := '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-pkg-config' 157 MXE_PKG_CONFIG := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)pkg-config'
150 MXE_QMAKE := '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-qmake' 158 MXE_QMAKE := '$(BUILD_TOOLS_PREFIX)/bin/$(MXE_TOOL_PREFIX)qmake'
151 endif 159 endif
152 160
153 ifeq ($(MXE_SYSTEM),mingw) 161 ifeq ($(MXE_SYSTEM),mingw)
154 MAKE_SHARED_FROM_STATIC_OPTIONS := --windowsdll 162 MAKE_SHARED_FROM_STATIC_OPTIONS := --windowsdll
155 endif 163 endif