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.

Sign up for GitHub

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

Jump to bottom

Add platform osx_x86-64 to build-natives-unix #50

Merged
merged 1 commit into from
Oct 17, 2018
Merged

Add platform osx_x86-64 to build-natives-unix #50

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 9 additions & 3 deletions openj9.test.sharedClasses.jvmti/src/native/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#################################################################################
# Copyright (c) 2017 IBM Corp.
# Copyright (c) 2017, 2018 IBM Corp.
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License 2.0 which accompanies this distribution
Expand All @@ -26,7 +26,7 @@
# platform - The platform to build for. The valid values for this argument are
# aix_ppc-32, aix_ppc-64, linux_390-31, linux_390-64, linux_ppc-32
# linux_ppc-64, linux_x86-32, linux_x86-64, win_x86-32, win_x86-64
# zos_390-31, zos_390-64
# zos_390-31, zos_390-64,osx_x86-64
# outdir - The directory where a platform directory will be created and the lib will be place
# javadir - The java.home property directory (ie c:\sdk\jre)
# srcdir - Where the source files are located
Expand Down Expand Up @@ -61,7 +61,7 @@ P=:
###
# Check platform is set to a single valid value
###
VALID_PLATFORMS?=aix_ppc-32,aix_ppc-64,linux_390-31,linux_390-64,linux_ppc-32,linux_ppc-64,linux_x86-32,linux_x86-64,win_x86-32,win_x86-64,zos_390-31,zos_390-64,linux_ppcle-64,linux_arm-32
VALID_PLATFORMS?=aix_ppc-32,aix_ppc-64,linux_390-31,linux_390-64,linux_ppc-32,linux_ppc-64,linux_x86-32,linux_x86-64,win_x86-32,win_x86-64,zos_390-31,zos_390-64,linux_ppcle-64,linux_arm-32,osx_x86-64
ifndef PLATFORM
$(error "The variable PLATFORM needs to be defined")
endif
Expand Down Expand Up @@ -142,6 +142,12 @@ ifeq ($(PLATFORM),linux_x86-64)
IFLAGS=-I. -I$(JAVA_HOME)/../include -I$(JAVA_HOME)/../include/linux -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include
endif

ifeq ($(PLATFORM),osx_x86-64)
CFLAGS=-fPIC -fno-omit-frame-pointer -O0 -g3 -pedantic -Wall -std=c99 -c -D_JNI_IMPLEMENTATION_ -D_TRIVIAL_AGENT -DOS64 -o $(OBJDIR)/sharedClasses$(OSUFFIX)
LFLAGS=-shared -o
IFLAGS=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/darwin -I/usr/include
endif

ifeq ($(PLATFORM),win_x86-32)
WIN=1
endif
Expand Down