09af662602
this patch enables javac arguments -source & -target which will allow us to build with 1.5 but run with 1.4 or 1.5. building with 1.5 will be enabled in java.port.mk later. - sync patches (line numbers/-p)
22 lines
616 B
Plaintext
22 lines
616 B
Plaintext
$OpenBSD: patch-solenv_inc_settings_mk,v 1.2 2006/11/09 15:18:01 kurt Exp $
|
|
--- solenv/inc/settings.mk.orig.port Wed Nov 8 11:46:32 2006
|
|
+++ solenv/inc/settings.mk Wed Nov 8 11:47:20 2006
|
|
@@ -1109,6 +1109,8 @@ RSCDEFS+=-DOSL_DEBUG_LEVEL=$(DBG_LEVEL)
|
|
CDEFS+=-DSVX_LIGHT
|
|
.ENDIF
|
|
|
|
+CFLAGS+= $(ENVCFLAGS)
|
|
+
|
|
.IF "$(optimize)"!=""
|
|
CDEFS+=$(CDEFSOPT)
|
|
CFLAGS+=$(CFLAGSOPT)
|
|
@@ -1255,7 +1257,7 @@ CFLAGSAPPEND+=$(ENVWARNFLAGS)
|
|
|
|
CDEFS+= $(ADDCDEFS)
|
|
CDEFS+= $(ENVCDEFS)
|
|
-CFLAGS+= $(CFLAGSCALL) $(ENVCFLAGS)
|
|
+CFLAGS+= $(CFLAGSCALL)
|
|
CFLAGSCXX+= $(ENVCFLAGSCXX)
|
|
# andersrum wg. -TPxxxx
|
|
CFLAGSINCXX+:=$(ENVCFLAGSINCXX)
|