mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-27 21:27:27 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
28 lines
651 B
Diff
28 lines
651 B
Diff
diff --git a/src/native/Makefile b/src/native/Makefile
|
|
index 679adb7..a1f2a6a 100644
|
|
--- a/src/native/Makefile
|
|
+++ b/src/native/Makefile
|
|
@@ -51,11 +51,11 @@ JavaEditline_LIBS = -ledit -ltermcap
|
|
ifeq (cygwin,$(WIN32))
|
|
JavaGetline_LIBS = -lcygwin
|
|
endif
|
|
-CC = gcc
|
|
+CC ?= gcc
|
|
OBJ_EXT := o
|
|
LIB_PRE := lib
|
|
LIB_EXT := so
|
|
-CFLAGS=-fPIC -DPOSIX
|
|
+CFLAGS += -fPIC -DPOSIX
|
|
endif
|
|
|
|
|
|
@@ -97,7 +97,7 @@ ifeq (CYGWIN,$(WIN32))
|
|
$(CC) -W1,$(ROOTDIR)/lib$(TG).exp -o $@ \
|
|
$(OBJECTS) -W1,-e,_readline_init@12
|
|
else
|
|
- $(CC) -shared $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@
|
|
+ $(CC) -shared $(LDFLAGS) $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@
|
|
endif
|
|
endif
|
|
|