OpenJDK / bsd-port / jdk8 / jdk
changeset 6027:dcee387cde81
8001891: build-infra: Adding X_CFLAGS and X_LIBS to lwawt and sizer compilation
Reviewed-by: ohair
| author | ohrstrom |
|---|---|
| date | Mon, 29 Oct 2012 13:41:38 -0700 |
| parents | 5b29d6157504 |
| children | 524d1a705f7b |
| files | makefiles/CompileNativeLibraries.gmk makefiles/GensrcX11Wrappers.gmk |
| diffstat | 2 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/makefiles/CompileNativeLibraries.gmk Mon Oct 29 13:04:40 2012 -0700 +++ b/makefiles/CompileNativeLibraries.gmk Mon Oct 29 13:41:38 2012 -0700 @@ -3385,6 +3385,8 @@ INCLUDE_FILES:=$(LIBAWT_LWAWT_FILES),\ OPTIMIZATION:=LOW, \ CFLAGS:=$(CFLAGS_JDKLIB) \ + $(X_CFLAGS) \ + $(X_LIBS) \ $(foreach dir,$(LIBAWT_LWAWT_DIRS),-I$(dir)) \ -I$(JDK_TOPDIR)/src/macosx/native/sun/osxapp \ -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
--- a/makefiles/GensrcX11Wrappers.gmk Mon Oct 29 13:04:40 2012 -0700 +++ b/makefiles/GensrcX11Wrappers.gmk Mon Oct 29 13:41:38 2012 -0700 @@ -64,6 +64,8 @@ $(MKDIR) -p $(@D) $(RM) $@ $@.tmp (cd $(@D) && $(BUILD_CC) -m$* -o $@.tmp $< \ + $(X_CFLAGS) \ + $(X_LIBS) \ -I$(JDK_OUTPUTDIR)/include \ -I$(JDK_TOPDIR)/src/share/javavm/export \ -I$(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/javavm/export \