Skip to content

Commit

Permalink
Try to get building without extra env copy
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewfeickert committed Sep 16, 2024
1 parent e600b66 commit e905d59
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ def build_extensions(self):
env = os.environ.copy()
env["PYTHON"] = sys.executable
env["PYTHON_INCLUDE"] = f'-I{sysconfig.get_path("include")}'
env["CXX"] = env.get("CXX", "g++")
env["CXXFLAGS"] = "-O3 -Bstatic -Bdynamic -std=c++17 " + env.get(
"CXXFLAGS", ""
)
Expand Down Expand Up @@ -133,18 +134,9 @@ def build_extensions(self):
subprocess.run(["cat", "config.log"], cwd=FASTJET, check=True)
raise

env["ORIGIN"] = "$ORIGIN" # if evaluated, it will still be '$ORIGIN'
subprocess.run(["make", "-j"], cwd=FASTJET, env=env, check=True)
subprocess.run(["make", "install"], cwd=FASTJET, env=env, check=True)

# Update the environment for fastjet-contrib build
env = os.environ.copy()
env["CXX"] = env.get("CXX", "g++")
env["CXXFLAGS"] = "-O3 -Bstatic -Bdynamic -std=c++17 " + env.get(
"CXXFLAGS", ""
)
env["LDFLAGS"] = env.get("LDFLAGS", "")

# For aarch64 macOS need to set the LDFLAGS for Homebrew installed
# dependencies to be found. However, fastjet-contrib's configure
# script does not use/accept LDFLAGS as an argument, and so to get
Expand Down

0 comments on commit e905d59

Please sign in to comment.