Commit ba1b15be authored by Reno Dakota's avatar Reno Dakota Committed by Silvan Mosberger
Browse files

squeak: fix build

parent 67fd9cc2

pkgs/development/compilers/squeak/cc-no-export-dynamic.patch

0 → 100644
+20 −0
Original line number Diff line number Diff line 
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

pkgs/development/compilers/squeak/default.nix

+3 −0
Original line number Diff line number Diff line
@@ -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 = ''