diff options
| author | asaha <none@none> | 2017-01-17 09:20:33 -0800 |
|---|---|---|
| committer | asaha <none@none> | 2017-01-17 09:20:33 -0800 |
| commit | 971720cc67db06d2740dbb1a2689c03b286074fe (patch) | |
| tree | a3e61bfa0ca0acdc33163e1301bedecf178e420f | |
| parent | 0164dd74078b7e97a51f54f63dd2b5ee13329d4b (diff) | |
| parent | 1bc0d874d72bdd68ba1c3a9f9d57c69e6d1abe18 (diff) | |
| download | jdk8u-971720cc67db06d2740dbb1a2689c03b286074fe.tar.gz | |
Merge
| -rw-r--r-- | make/common/NativeCompilation.gmk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk index 494ebef..670f911 100644 --- a/make/common/NativeCompilation.gmk +++ b/make/common/NativeCompilation.gmk @@ -297,17 +297,21 @@ define SetupNativeCompilation $$(shell $(RM) -f $$($1_SUPERFLUOUS_OBJS)) endif - # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables for CFLAGS. - $1_EXTRA_CFLAGS:=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CFLAGS_$(OPENJDK_TARGET_OS)) + # Pickup extra OPENJDK_TARGET_OS_API, OPENJDK_TARGET_OS, and/or OPENJDK_TARGET_OS plus + # OPENJDK_TARGET_CPU pair dependent variables for CFLAGS. + $1_EXTRA_CFLAGS:=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)) $$($1_CFLAGS_$(OPENJDK_TARGET_OS)) \ + $$($1_CFLAGS_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU)) ifneq ($(DEBUG_LEVEL),release) # Pickup extra debug dependent variables for CFLAGS $1_EXTRA_CFLAGS+=$$($1_CFLAGS_debug) $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_debug) $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_debug) + $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU)_debug) else $1_EXTRA_CFLAGS+=$$($1_CFLAGS_release) $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS_API)_release) $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_release) + $1_EXTRA_CFLAGS+=$$($1_CFLAGS_$(OPENJDK_TARGET_OS)_$(OPENJDK_TARGET_CPU)_release) endif # Pickup extra OPENJDK_TARGET_OS_API and/or OPENJDK_TARGET_OS dependent variables for CXXFLAGS. |