Conversation
Contributor
|
it looks like just removing the remove -export-dynamic from compilation stepdiff --git a/pkgs/development/compilers/squeak/cc-no-export-dynamic.diff b/pkgs/development/compilers/squeak/cc-no-export-dynamic.diff
new file mode 100644
index 000000000000..d4a1047d80d5
--- /dev/null
+++ b/pkgs/development/compilers/squeak/cc-no-export-dynamic.diff
@@ -0,0 +1,20 @@
+diff --git a/platforms/unix/config/make.prg.in b/platforms/unix/config/make.prg.in
+index 96a64a1..05f6114 100644
+--- a/platforms/unix/config/make.prg.in
++++ b/platforms/unix/config/make.prg.in
+@@ -8,13 +8,13 @@ o = .o
+ a = .a
+ x =
+ COMPILE = $(CC) $(CFLAGS) $(CPPFLAGS) $(XCFLAGS) \
+- $(LDFLAGS) $(XLDFLAGS) $(TARGET_ARCH) -export-dynamic -c -o
++ $(LDFLAGS) $(XLDFLAGS) $(TARGET_ARCH) -c -o
+ COMPILEIFP = $(CC) $(CFLAGS) $(XCFLAGS) \
+ $(LDFLAGS) $(XLDFLAGS) $(TARGET_ARCH) -export-dynamic -fno-omit-frame-pointer -c -o
+ CXXFLAGS = $(CFLAGS) # Hack; can't be bothered to add CXXFLAGS to the configure mess
+ COMPILE.cpp = $(COMPILE.cc)
+ COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(XCFLAGS) \
+- $(LDFLAGS) $(XLDFLAGS) $(TARGET_ARCH) -export-dynamic -c -o
++ $(LDFLAGS) $(XLDFLAGS) $(TARGET_ARCH) -c -o
+ LINK = $(LIBTOOL) --mode=link \
+ $(CC) $(CFLAGS) $(XCFLAGS) \
+ $(LDFLAGS) $(XLDFLAGS) $(TARGET_ARCH) -export-dynamic -o
diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix
index 0494539c4435..9e3c1cfe0d8c 100644
--- a/pkgs/development/compilers/squeak/default.nix
+++ b/pkgs/development/compilers/squeak/default.nix
@@ -135,6 +135,7 @@ in stdenv.mkDerivation {
./squeak-configure-version.patch
./squeak-plugins-discovery.patch
./squeak-squeaksh-nixpkgs.patch
+ ./cc-no-export-dynamic.diff
];
postPatch = '' |
7399e9f to
ba1b15b
Compare
Member
Author
|
@paparodeo Thank you, it works! |
ghost
approved these changes
Nov 24, 2024
paparodeo
approved these changes
Nov 24, 2024
Contributor
|
Successfully created backport PR for |
1 task
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes the squeak build for ZHF (#352882) by switching to LLVM 17, because LLVM 18 is broken because
clangdoesn't support-export-dynamicanymore. It looks like-rdynamicshould work, but I don't quite know how to patch it nicely. Ping @ehmry as the package maintainer.Build: https://hydra.nixos.org/build/267872600
Broken since the switch to LLVM 18 in #312981
This is the bi-yearly demo fix for the #ZurichZHF Hackathon! 🎉
Things done
x86_64-linuxThis work is funded by Tweag and Antithesis ✨
Add a 👍 reaction to pull requests you find important.