INTEGRATION: CWS gcj3 (1.4.6); FILE MERGED
2005/03/10 10:57:16 cmc 1.4.6.2: #i44359# undo SHL1NOCHECK for gcj, confirmed with gcj guys that it's their bug 2005/03/08 12:13:16 cmc 1.4.6.1: #i44359# bean now compilable with gcj
This commit is contained in:
parent
9d6df2c641
commit
a3e33c331d
@ -16,10 +16,6 @@ NO_BSYMBOLIC=TRUE
|
||||
nojava:
|
||||
@echo "Not building odk/source/OOSupport because Java has been disabled"
|
||||
.ENDIF
|
||||
.IF "$(JDK)"=="gcj"
|
||||
all:
|
||||
@echo This dir cannot be build with gcj because of jawt.h
|
||||
.ENDIF
|
||||
.IF "$(OS)"=="MACOSX"
|
||||
dummy:
|
||||
@echo "Nothing to build for OS $(OS)"
|
||||
@ -40,6 +36,10 @@ SHL1STDLIBS+=-lzip -lawt
|
||||
SHL1STDLIBS+=-lstdc++
|
||||
.ENDIF
|
||||
|
||||
.IF "$(JDK)" == "gcj"
|
||||
SHL1STDLIBS+=-lgcj
|
||||
.ENDIF
|
||||
|
||||
NO_SHL1DESCRIPTION=TRUE
|
||||
|
||||
# --- Targets ------------------------------------------------------
|
||||
|
Loading…
x
Reference in New Issue
Block a user