File tree Expand file tree Collapse file tree 2 files changed +23
-0
lines changed
pkgs/development/compilers/squeak Expand file tree Collapse file tree 2 files changed +23
-0
lines changed Original file line number Diff line number Diff line change 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
Original file line number Diff line number Diff 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 = ''
You can’t perform that action at this time.
0 commit comments