Changeset 26778 for main/trunk


Ignore:
Timestamp:
2013-01-25T10:30:00+13:00 (11 years ago)
Author:
davidb
Message:

Adding the minus option '-static-libstdc++' can cause linking problems on some linux/gcc distributions. The motivation for adding this was for when cross-compiling on a linux host using MinGW (to generate native Windows binaries). The mod adds a check to detect the cross-compiling/windows case, and only adds the minus option in if it is so

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone2/common-src/indexers/mgpp/jni/Makefile.in

    r26657 r26778  
    3535LDFLAGS = @LDFLAGS@
    3636#NOTE: libmgpptext.a needs to come before libmgpplib.a !!!
    37 QUERY_LIBS = ../text/libmgpptext.a   ../lib/libmgpplib.a $(AFLIBS) -static-libstdc++ ../../../packages/iconv/lib/libiconv.a @LIBS@
    38 PASSES_LIBS = ../text/libmgpppass.a ../lib/libmgpplib.a -static-libstdc++ @LIBS@
     37
     38ifeq ($(GSDLOS),windows)
     39  QUERY_LIBS = ../text/libmgpptext.a   ../lib/libmgpplib.a $(AFLIBS) -static-libstdc++ ../../../packages/iconv/lib/libiconv.a @LIBS@
     40  PASSES_LIBS = ../text/libmgpppass.a ../lib/libmgpplib.a -static-libstdc++ @LIBS@
     41else
     42  QUERY_LIBS = ../text/libmgpptext.a   ../lib/libmgpplib.a $(AFLIBS) ../../../packages/iconv/lib/libiconv.a @LIBS@
     43  PASSES_LIBS = ../text/libmgpppass.a ../lib/libmgpplib.a @LIBS@
     44endif
     45
    3946TOUCH = echo timestamp >
    4047AWK = @AWK@
Note: See TracChangeset for help on using the changeset viewer.