make/hotspot/lib/CompileLibraries.gmk

*** 1,7 ****
  #
! # Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 29,43 ****
  include MakeBase.gmk
  include NativeCompilation.gmk
  
  include HotspotCommon.gmk
  
- # The dtrace setup must be done both before and after CompileJvm.gmk, due to
- # intricate dependencies.
- include lib/CompileDtracePreJvm.gmk
  include lib/CompileJvm.gmk
! include lib/CompileDtracePostJvm.gmk
  
  ifeq ($(BUILD_GTEST), true)
    include lib/CompileGtest.gmk
  endif
  
--- 29,40 ----
  include MakeBase.gmk
  include NativeCompilation.gmk
  
  include HotspotCommon.gmk
  
  include lib/CompileJvm.gmk
! include lib/CompileDtraceLibraries.gmk
  
  ifeq ($(BUILD_GTEST), true)
    include lib/CompileGtest.gmk
  endif