Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove aarch64-linux-gnu- from native build #5451

Merged
merged 1 commit into from
Apr 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions buildspecs/linux_aarch64.spec
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,16 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<property name="sun.jdk7.platform_id" value="linux-aarch64"/>
<property name="sun.jdk8.platform_id" value="linux-aarch64"/>
<property name="svn_stream" value=""/>
<property name="uma_make_cmd_ar" value="$(OPENJ9_CC_PREFIX)-ar"/>
<property name="uma_make_cmd_as" value="$(OPENJ9_CC_PREFIX)-as"/>
<property name="uma_make_cmd_cc" value="$(OPENJ9_CC_PREFIX)-gcc"/>
<property name="uma_make_cmd_cpp" value="$(OPENJ9_CC_PREFIX)-cpp -E -P"/>
<property name="uma_make_cmd_cxx" value="$(OPENJ9_CC_PREFIX)-g++"/>
<property name="uma_make_cmd_ar" value="ar"/>
<property name="uma_make_cmd_as" value="as"/>
<property name="uma_make_cmd_cc" value="gcc"/>
<property name="uma_make_cmd_cpp" value="cpp -E -P"/>
<property name="uma_make_cmd_cxx" value="g++"/>
<property name="uma_make_cmd_cxx_dll_ld" value="$(CC)"/>
<property name="uma_make_cmd_cxx_exe_ld" value="$(CC)"/>
<property name="uma_make_cmd_dll_ld" value="$(CC)"/>
<property name="uma_make_cmd_exe_ld" value="$(CC)"/>
<property name="uma_make_cmd_ranlib" value="$(OPENJ9_CC_PREFIX)-ranlib"/>
<property name="uma_make_cmd_ranlib" value="ranlib"/>
<property name="uma_processor" value="aarch64"/>
<property name="uma_type" value="unix,linux"/>
</properties>
Expand Down
12 changes: 6 additions & 6 deletions buildspecs/linux_aarch64_cmprssptrs.spec
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,16 @@ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-excepti
<property name="sun.jdk7.platform_id" value="linux-aarch64"/>
<property name="sun.jdk8.platform_id" value="linux-aarch64"/>
<property name="svn_stream" value=""/>
<property name="uma_make_cmd_ar" value="$(OPENJ9_CC_PREFIX)-ar"/>
<property name="uma_make_cmd_as" value="$(OPENJ9_CC_PREFIX)-as"/>
<property name="uma_make_cmd_cc" value="$(OPENJ9_CC_PREFIX)-gcc"/>
<property name="uma_make_cmd_cpp" value="$(OPENJ9_CC_PREFIX)-cpp -E -P"/>
<property name="uma_make_cmd_cxx" value="$(OPENJ9_CC_PREFIX)-g++"/>
<property name="uma_make_cmd_ar" value="ar"/>
<property name="uma_make_cmd_as" value="as"/>
<property name="uma_make_cmd_cc" value="gcc"/>
<property name="uma_make_cmd_cpp" value="cpp -E -P"/>
<property name="uma_make_cmd_cxx" value="g++"/>
<property name="uma_make_cmd_cxx_dll_ld" value="$(CC)"/>
<property name="uma_make_cmd_cxx_exe_ld" value="$(CC)"/>
<property name="uma_make_cmd_dll_ld" value="$(CC)"/>
<property name="uma_make_cmd_exe_ld" value="$(CC)"/>
<property name="uma_make_cmd_ranlib" value="$(OPENJ9_CC_PREFIX)-ranlib"/>
<property name="uma_make_cmd_ranlib" value="ranlib"/>
<property name="uma_processor" value="aarch64"/>
<property name="uma_type" value="unix,linux"/>
</properties>
Expand Down
25 changes: 12 additions & 13 deletions runtime/gc_glue_java/configure_includes/configure_linux_aarch64.mk
Original file line number Diff line number Diff line change
Expand Up @@ -49,25 +49,24 @@ ifneq (,$(findstring _cross,$(SPEC)))
--host=$(OPENJ9_CC_PREFIX) \
--build=x86_64-pc-linux-gnu \
'OMR_CROSS_CONFIGURE=yes'
endif

ifeq (default,$(origin AS))
AS = $(OPENJ9_CC_PREFIX)-as
endif
ifeq (default,$(origin CC))
CC = $(OPENJ9_CC_PREFIX)-gcc
endif
ifeq (default,$(origin CXX))
CXX = $(OPENJ9_CC_PREFIX)-g++
endif
ifeq (default,$(origin AR))
AR = $(OPENJ9_CC_PREFIX)-ar
ifeq (default,$(origin AS))
AS = $(OPENJ9_CC_PREFIX)-as
endif
ifeq (default,$(origin CC))
CC = $(OPENJ9_CC_PREFIX)-gcc
endif
ifeq (default,$(origin CXX))
CXX = $(OPENJ9_CC_PREFIX)-g++
endif
ifeq (default,$(origin AR))
AR = $(OPENJ9_CC_PREFIX)-ar
endif
DanHeidinga marked this conversation as resolved.
Show resolved Hide resolved
endif

CONFIGURE_ARGS += 'AS=$(AS)'
CONFIGURE_ARGS += 'CC=$(CC)'
CONFIGURE_ARGS += 'CXX=$(CXX)'
CONFIGURE_ARGS += 'OBJCOPY=$(OPENJ9_CC_PREFIX)-objcopy'

CONFIGURE_ARGS += libprefix=lib exeext= solibext=.so arlibext=.a objext=.o

Expand Down