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

Adapt to recent openjdk changes #263

Merged
merged 1 commit into from
Jan 7, 2021

Conversation

keithc-ca
Copy link
Member

@keithc-ca keithc-ca commented Jan 7, 2021

  • fix handling of relative paths by fixpath.sh; we don't want to map arguments like
    -I../../include
    to
    -I..C:\cygwin\..\include

    The original version treated the first slash as if it were the beginning of an absolute path.

  • update the use of buildj9tools.mk to build the java preprocessor to avoid issues due to changes to FixPath

  • compute OPENJ9_VS_INCLUDE and OPENJ9_VS_LIB and make available for substitutions (replacing VS_INCLUDE and VS_LIB)

  • remove redundant exports

    • INCLUDE and LIB are exported by custom-spec.gmk
  • adjust macro references

    • CYGPATH -> PATHTOOL
    • EXE_SUFFIX -> EXECUTABLE_SUFFIX

* fix handling of relative paths by fixpath.sh;
  we don't want to map arguments like

    -I../../include
  to
    -I..C:\cygwin\..\include

  The original version treated the first slash as if it were
  the beginning of an absolute path.

* update the use of buildj9tools.mk to build the java preprocessor
  to avoid issues due to changes to FixPath

* compute OPENJ9_VS_INCLUDE and OPENJ9_VS_LIB and make available
  for substitutions (replacing VS_INCLUDE and VS_LIB)

* remove redundant exports
  - INCLUDE and LIB are exported by custom-spec.gmk

* adjust macro references
  - CYGPATH    -> PATHTOOL
  - EXE_SUFFIX -> EXECUTABLE_SUFFIX

Signed-off-by: Keith W. Campbell <[email protected]>
@keithc-ca
Copy link
Member Author

Jenkins test sanity plinux,win jdknext depends eclipse-openj9/openj9#11589

@pshipton pshipton merged commit 6623d87 into ibmruntimes:openj9-staging Jan 7, 2021
@keithc-ca keithc-ca deleted the windows branch January 7, 2021 23:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants