From f45ccfa1673e39f8c9db0a138fc82e8992c25e7f Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 21 Nov 2024 03:52:10 +0100 Subject: [PATCH] build: Remove Windows quirk The current version of gccdeps.py works on Windows. --- spec/build/cpukit/optclang.yml | 5 +---- spec/build/cpukit/optgcc.yml | 5 +---- wscript | 1 - 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/spec/build/cpukit/optclang.yml b/spec/build/cpukit/optclang.yml index f195836f58..544defc0f3 100644 --- a/spec/build/cpukit/optclang.yml +++ b/spec/build/cpukit/optclang.yml @@ -27,10 +27,7 @@ actions: - substitute: null - env-append: ABI_FLAGS - script: | - load = "ar asm clang clang++" - if not is_windows_host: - load += " gccdeps" - conf.load(load) + conf.load("ar asm clang clang++ gccdeps") build-type: option copyrights: - Copyright (C) 2020 Hesham Almatary diff --git a/spec/build/cpukit/optgcc.yml b/spec/build/cpukit/optgcc.yml index 94af494af4..a6350f9e76 100644 --- a/spec/build/cpukit/optgcc.yml +++ b/spec/build/cpukit/optgcc.yml @@ -20,10 +20,7 @@ actions: - find-program: null - env-assign: LD - script: | - load = "ar g++ gas gcc" - if not is_windows_host: - load += " gccdeps" - conf.load(load) + conf.load("ar g++ gas gcc gccdeps") - set-value: -qrtems - env-append: LDFLAGS - env-append: PKGCONFIG_LDFLAGS diff --git a/wscript b/wscript index 1bb0b36c35..0e977362b6 100755 --- a/wscript +++ b/wscript @@ -41,7 +41,6 @@ except: from waflib.TaskGen import after, before_method, feature -is_windows_host = os.name == "nt" or sys.platform in ["msys", "cygwin"] version = { "__RTEMS_MAJOR__": "6", # version "__RTEMS_MINOR__": "0", # revision