Skip to content

squeak: fix build #358156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emilazy merged 1 commit into from
Nov 25, 2024
Merged

squeak: fix build #358156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions pkgs/development/compilers/squeak/cc-no-export-dynamic.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions pkgs/development/compilers/squeak/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,9 @@ in stdenv.mkDerivation {
./squeak-configure-version.patch
./squeak-plugins-discovery.patch
./squeak-squeaksh-nixpkgs.patch
# it looks like -export-dynamic is being passed erroneously to the compiler,
# as it is a linker flag and at this step the build is just compiling notice the -c flag.
./cc-no-export-dynamic.patch
];

postPatch = ''
Expand Down