Use common build directory for ports and system libs. NFC

Split out from emscripten-core#23924

Author: sbc100

tools/ports/__init__.py

@@ -233,7 +233,7 @@ def erase():
 
   @staticmethod
   def get_build_dir():
-    return cache.get_path('ports-builds')
+    return system_libs.get_build_dir()
 
   name_cache: Set[str] = set()
 

tools/ports/sdl2_gfx.py

@@ -16,11 +16,12 @@ def needed(settings):
 
 
 def get(ports, settings, shared):
-  sdl_build = os.path.join(ports.get_build_dir(), 'sdl2')
-  assert os.path.exists(sdl_build), 'You must use SDL2 to use SDL2_gfx'
   ports.fetch_project('sdl2_gfx', f'https://github.com/svn2github/sdl2_gfx/archive/{TAG}.zip', sha512hash=HASH)
 
   def create(final):
+    sdl_build = os.path.join(ports.get_build_dir(), 'sdl2')
+    assert os.path.exists(sdl_build), 'You must use SDL2 to use SDL2_gfx'
+
     source_path = ports.get_dir('sdl2_gfx', 'sdl2_gfx-' + TAG)
     ports.build_port(source_path, final, 'sdl2_gfx', exclude_dirs=['test'], flags=['-sUSE_SDL=2'])
     ports.install_headers(source_path, target='SDL2')

tools/ports/sdl2_image.py

@@ -52,12 +52,13 @@ def get_lib_name(settings):
 
 
 def get(ports, settings, shared):
-  sdl_build = os.path.join(ports.get_build_dir(), 'sdl2')
-  assert os.path.exists(sdl_build), 'You must use SDL2 to use SDL2_image'
   ports.fetch_project('sdl2_image', f'https://github.com/libsdl-org/SDL_image/archive/refs/tags/{TAG}.zip', sha512hash=HASH)
   libname = get_lib_name(settings)
 
   def create(final):
+    sdl_build = os.path.join(ports.get_build_dir(), 'sdl2')
+    assert os.path.exists(sdl_build), 'You must use SDL2 to use SDL2_image'
+
     src_dir = ports.get_dir('sdl2_image', 'SDL_image-' + TAG)
     ports.install_headers(src_dir, target='SDL2')
     srcs = '''IMG.c IMG_bmp.c IMG_gif.c IMG_jpg.c IMG_lbm.c IMG_pcx.c IMG_png.c IMG_pnm.c IMG_tga.c

tools/ports/sdl2_mixer.py

@@ -36,12 +36,13 @@ def get_lib_name(settings):
 
 
 def get(ports, settings, shared):
-  sdl_build = os.path.join(ports.get_build_dir(), 'sdl2')
-  assert os.path.exists(sdl_build), 'You must use SDL2 to use SDL2_mixer'
   ports.fetch_project('sdl2_mixer', f'https://github.com/libsdl-org/SDL_mixer/archive/{TAG}.zip', sha512hash=HASH)
   libname = get_lib_name(settings)
 
   def create(final):
+    sdl_build = os.path.join(ports.get_build_dir(), 'sdl2')
+    assert os.path.exists(sdl_build), 'You must use SDL2 to use SDL2_mixer'
+
     source_path = ports.get_dir('sdl2_mixer', 'SDL_mixer-' + TAG)
     flags = [
       '-sUSE_SDL=2',

tools/ports/sdl2_net.py

@@ -16,11 +16,12 @@ def needed(settings):
 
 
 def get(ports, settings, shared):
-  sdl_build = os.path.join(ports.get_build_dir(), 'sdl2')
-  assert os.path.exists(sdl_build), 'You must use SDL2 to use SDL2_net'
   ports.fetch_project('sdl2_net', f'https://github.com/emscripten-ports/SDL2_net/archive/{TAG}.zip', sha512hash=HASH)
 
   def create(final):
+    sdl_build = os.path.join(ports.get_build_dir(), 'sdl2')
+    assert os.path.exists(sdl_build), 'You must use SDL2 to use SDL2_net'
+
     src_dir = ports.get_dir('sdl2_net', 'SDL2_net-' + TAG)
     ports.install_headers(src_dir, target='SDL2')
     excludes = ['chatd.c', 'chat.cpp', 'showinterfaces.c']

tools/system_libs.py

@@ -79,6 +79,10 @@ def get_base_cflags(build_dir, force_object_files=False, preprocess=True):
   return flags
 
 
+def get_build_dir():
+  return cache.get_path('build')
+
+
 def clean_env():
   # building system libraries and ports should be hermetic in that it is not
   # affected by things like EMCC_CFLAGS which the user may have set.
@@ -150,7 +154,7 @@ def create_lib(libname, inputs):
 
 
 def get_top_level_ninja_file():
-  return os.path.join(cache.get_path('build'), 'build.ninja')
+  return os.path.join(get_build_dir(), 'build.ninja')
 
 
 def run_ninja(build_dir):
@@ -552,7 +556,7 @@ def customize_build_cmd(self, cmd, _filename):
   def do_build(self, out_filename, generate_only=False):
     """Builds the library and returns the path to the file."""
     assert out_filename == self.get_path(absolute=True)
-    build_dir = os.path.join(cache.get_path('build'), self.get_base_name())
+    build_dir = os.path.join(get_build_dir(), self.get_base_name())
     if USE_NINJA:
       self.generate_ninja(build_dir, out_filename)
       if not generate_only: