mirror of
https://github.com/corda/corda.git
synced 2025-01-31 16:35:43 +00:00
Use mingw32 'strip' when compiling for Windows.
This fixes the error when using /usr/bin/strip on Ubuntu 8.10 when it believes the target file is of an "ambiguous format".
This commit is contained in:
parent
f13bf44e87
commit
db3434001f
3
makefile
3
makefile
@ -123,6 +123,7 @@ ifeq ($(platform),windows)
|
|||||||
ar = i586-mingw32msvc-ar
|
ar = i586-mingw32msvc-ar
|
||||||
ranlib = i586-mingw32msvc-ranlib
|
ranlib = i586-mingw32msvc-ranlib
|
||||||
objcopy = i586-mingw32msvc-objcopy
|
objcopy = i586-mingw32msvc-objcopy
|
||||||
|
strip = i586-mingw32msvc-strip
|
||||||
else
|
else
|
||||||
build-cflags = $(common-cflags) \
|
build-cflags = $(common-cflags) \
|
||||||
"-I$(JAVA_HOME)/include/win32" -I$(src) -mthreads
|
"-I$(JAVA_HOME)/include/win32" -I$(src) -mthreads
|
||||||
@ -150,11 +151,9 @@ ifeq ($(mode),stress-major)
|
|||||||
endif
|
endif
|
||||||
ifeq ($(mode),fast)
|
ifeq ($(mode),fast)
|
||||||
cflags += -O3 -g3 -DNDEBUG
|
cflags += -O3 -g3 -DNDEBUG
|
||||||
strip = strip
|
|
||||||
endif
|
endif
|
||||||
ifeq ($(mode),small)
|
ifeq ($(mode),small)
|
||||||
cflags += -Os -g3 -DNDEBUG
|
cflags += -Os -g3 -DNDEBUG
|
||||||
strip = strip
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
cpp-objects = $(foreach x,$(1),$(patsubst $(2)/%.cpp,$(3)/%.o,$(x)))
|
cpp-objects = $(foreach x,$(1),$(patsubst $(2)/%.cpp,$(3)/%.o,$(x)))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user