Skip to content

Commit ba1b15b

Browse files
paparodeoinfinisil
authored andcommitted
squeak: fix build
1 parent 67fd9cc commit ba1b15b

File tree

2 files changed

+23
-0
lines changed

2 files changed

+23
-0
lines changed
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
diff --git a/platforms/unix/config/make.prg.in b/platforms/unix/config/make.prg.in
2+
index 96a64a1..05f6114 100644
3+
--- a/platforms/unix/config/make.prg.in
4+
+++ b/platforms/unix/config/make.prg.in
5+
@@ -8,13 +8,13 @@ o = .o
6+
a = .a
7+
x =
8+
COMPILE = $(CC) $(CFLAGS) $(CPPFLAGS) $(XCFLAGS) \
9+
- $(LDFLAGS) $(XLDFLAGS) $(TARGET_ARCH) -export-dynamic -c -o
10+
+ $(LDFLAGS) $(XLDFLAGS) $(TARGET_ARCH) -c -o
11+
COMPILEIFP = $(CC) $(CFLAGS) $(XCFLAGS) \
12+
$(LDFLAGS) $(XLDFLAGS) $(TARGET_ARCH) -export-dynamic -fno-omit-frame-pointer -c -o
13+
CXXFLAGS = $(CFLAGS) # Hack; can't be bothered to add CXXFLAGS to the configure mess
14+
COMPILE.cpp = $(COMPILE.cc)
15+
COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(XCFLAGS) \
16+
- $(LDFLAGS) $(XLDFLAGS) $(TARGET_ARCH) -export-dynamic -c -o
17+
+ $(LDFLAGS) $(XLDFLAGS) $(TARGET_ARCH) -c -o
18+
LINK = $(LIBTOOL) --mode=link \
19+
$(CC) $(CFLAGS) $(XCFLAGS) \
20+
$(LDFLAGS) $(XLDFLAGS) $(TARGET_ARCH) -export-dynamic -o

pkgs/development/compilers/squeak/default.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,9 @@ in stdenv.mkDerivation {
135135
./squeak-configure-version.patch
136136
./squeak-plugins-discovery.patch
137137
./squeak-squeaksh-nixpkgs.patch
138+
# it looks like -export-dynamic is being passed erroneously to the compiler,
139+
# as it is a linker flag and at this step the build is just compiling notice the -c flag.
140+
./cc-no-export-dynamic.patch
138141
];
139142

140143
postPatch = ''

0 commit comments

Comments
 (0)